mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
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:
commit
18436d48d7
1 changed files with 1 additions and 1 deletions
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue