mirror of
https://github.com/MariaDB/server.git
synced 2026-05-07 15:45:33 +02:00
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into magare.gmz:/home/kgeorge/mysql/autopush/B31440-5.1-opt sql/item_cmpfunc.cc: Auto merged
This commit is contained in:
commit
6c974c673f
3 changed files with 16 additions and 1 deletions
|
|
@ -4408,6 +4408,7 @@ Item_func_regex::fix_fields(THD *thd, Item **ref)
|
|||
if (args[1]->null_value)
|
||||
{ // Will always return NULL
|
||||
maybe_null=1;
|
||||
fixed= 1;
|
||||
return FALSE;
|
||||
}
|
||||
int error;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue