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

into  mysql.com:/home/bar/mysql-work/mysql-5.0.b31081
This commit is contained in:
unknown 2007-10-24 12:09:24 +05:00
commit 18436d48d7

View file

@ -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)