Commit e89e78d1 authored by bar@bar.myoffice.izhnet.ru's avatar bar@bar.myoffice.izhnet.ru
Browse files

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

into  mysql.com:/home/bar/mysql-work/mysql-5.0.b31081
parents 811e64de 5cfd557f

sql/item_cmpfunc.cc

+1 −1
Original line number Diff line number Diff line
@@ -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)