Commit 18436d48 authored by unknown's avatar unknown

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

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

parents 9be2220b 47bed4d4
......@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment