diff options
| author | Alexander Barkov <bar@mnogosearch.org> | 2013-12-17 01:38:44 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mnogosearch.org> | 2013-12-17 01:38:44 +0400 |
| commit | c5004e399eda1457508b5d71ca3b170eee3b40ee (patch) | |
| tree | 414c10e298af25c074757f4edf5b17a99f95a053 /sql/item_cmpfunc.cc | |
| parent | c1a65228757e25aabccfcf77c494811ed1e5a633 (diff) | |
| download | mariadb-git-c5004e399eda1457508b5d71ca3b170eee3b40ee.tar.gz | |
MDEV-5445 Server crashes in Item_func_like::fix_fields on LIKE ExtractValue(..)
Fixed.
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index bc0990d50b2..5852108dc43 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -5020,7 +5020,7 @@ bool Item_func_like::fix_fields(THD *thd, Item **ref) turboBM_compute_bad_character_shifts(); DBUG_PRINT("info",("done")); } - use_sampling= ((*first == wild_many || *first == wild_one) && len > 2); + use_sampling= (len > 2 && (*first == wild_many || *first == wild_one)); } } return FALSE; |