diff options
| author | unknown <konstantin@mysql.com> | 2006-01-14 19:12:07 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-01-14 19:12:07 +0300 |
| commit | e0c3bda70a51e9ffdeb925bca513716289b348fe (patch) | |
| tree | f695b5787cd4e7a84a1c9bbc67595ee0d94ed5b3 /sql | |
| parent | fdf998317923234b11b281a5885fb6c1552a0d3b (diff) | |
| parent | 04a78106272f82aebfd5cfbfa7264e32d3eb5651 (diff) | |
| download | mariadb-git-e0c3bda70a51e9ffdeb925bca513716289b348fe.tar.gz | |
Merge mysql.com:/opt/local/work/mysql-4.1-12734
into mysql.com:/opt/local/work/mysql-5.0-root
sql/item_cmpfunc.cc:
Auto merged
mysql-test/r/ps.result:
Manual merge
mysql-test/t/ps.test:
Manual merge
sql/item_cmpfunc.h:
Manual merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_cmpfunc.cc | 6 | ||||
| -rw-r--r-- | sql/item_cmpfunc.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 306277aa438..bb3f6e8b231 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -3059,6 +3059,12 @@ bool Item_func_like::fix_fields(THD *thd, Item **ref) return FALSE; } +void Item_func_like::cleanup() +{ + canDoTurboBM= FALSE; + Item_bool_func2::cleanup(); +} + #ifdef USE_REGEX bool diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index 98ccefd08ab..15aebd2492c 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -1001,6 +1001,7 @@ public: cond_result eq_cmp_result() const { return COND_TRUE; } const char *func_name() const { return "like"; } bool fix_fields(THD *thd, Item **ref); + void cleanup(); }; #ifdef USE_REGEX |