diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-16 19:09:54 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-16 19:09:54 +0200 |
| commit | 005c7e54214546584c8dc67a746e215f8dbe4b58 (patch) | |
| tree | dea50cd7b32808413e058d43d20cf230d1cc7477 /sql/item_func.cc | |
| parent | b9f220b45afaae9b61af29129a8c8ec5f9a7759b (diff) | |
| parent | 4f5c10e6b565bc2761b9d083e25c6a36141552a0 (diff) | |
| download | mariadb-git-005c7e54214546584c8dc67a746e215f8dbe4b58.tar.gz | |
mysql-5.5.32 merge
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index b047258818b..2fa9b35db9e 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -6130,6 +6130,13 @@ bool Item_func_match::fix_index() uint ft_to_key[MAX_KEY], ft_cnt[MAX_KEY], fts=0, keynr; uint max_cnt=0, mkeys=0, i; + /* + We will skip execution if the item is not fixed + with fix_field + */ + if (!fixed) + return false; + if (key == NO_SUCH_KEY) return 0; |