diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-05-10 23:42:01 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-05-10 23:42:01 +0200 |
| commit | 1170a54060168d885cbf682836342d4fc4ccae1a (patch) | |
| tree | d905276efb69388cdc70d8963e61de89a645c406 /sql | |
| parent | 73216f79e431e491649587856529e8797f7a5a3f (diff) | |
| download | mariadb-git-1170a54060168d885cbf682836342d4fc4ccae1a.tar.gz | |
fix a bad merge, causing a crash of fulltext.test in --ps-protocolmariadb-10.0.11
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_func.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index e6a903e2485..be5dcd070a1 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -6282,8 +6282,7 @@ bool Item_func_match::fix_fields(THD *thd, Item **ref) if (item->type() == Item::FIELD_ITEM) table= ((Item_field *)item)->field->table; - allows_multi_table_search &= - allows_search_on_non_indexed_columns(((Item_field *)item)->field->table); + allows_multi_table_search &= allows_search_on_non_indexed_columns(table); } /* |