Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl

into mysql.com:/home/bar/mysql-work/mysql-5.0.b31081

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into mysql.com:/home/bar/mysql-work/mysql-5.0.b31081
e89e78d1 · bar@bar.myoffice.izhnet.ru · 811e64de · 5cfd557f · e89e78d1
Commit e89e78d1 authored Oct 24, 2007 by bar@bar.myoffice.izhnet.ru
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/item_cmpfunc.cc sql/item_cmpfunc.cc +1 -1

No files found.
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -4255,7 +4255,7 @@ Item_func_regex::regcomp(bool send_error)
    res= &conv;
  }
-  if ((error= my_regcomp(&preg, res->c_ptr(),
+  if ((error= my_regcomp(&preg, res->c_ptr_safe(),
                         regex_lib_flags, regex_lib_charset)))
  {
    if (send_error)