diff options
| author | gkodinov/kgeorge@magare.gmz <> | 2007-10-13 09:13:00 +0300 |
|---|---|---|
| committer | gkodinov/kgeorge@magare.gmz <> | 2007-10-13 09:13:00 +0300 |
| commit | ce1ce20e7373b1c25cb9110e365a299555d4d510 (patch) | |
| tree | 68b649462ec249738c755dd4f437c0cf7fd1cb1d /sql/item_cmpfunc.cc | |
| parent | 1e3fd4942ea0e61a085d2b177dd2248ddef9131c (diff) | |
| parent | df422f7c3fb976d679eaba23389705cc5fe127cc (diff) | |
| download | mariadb-git-ce1ce20e7373b1c25cb9110e365a299555d4d510.tar.gz | |
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into magare.gmz:/home/kgeorge/mysql/autopush/B31440-5.1-opt
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 1710799d6e7..04e0011f1a7 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -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; |