mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix a bad merge, causing a crash of fulltext.test in --ps-protocol

Browse source
This commit is contained in:
Sergei Golubchik 2014-05-10 23:42:01 +02:00
parent 73216f79e4
commit 1170a54060
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sql/item_func.cc
View file

@ -6282,8 +6282,7 @@ bool Item_func_match::fix_fields(THD *thd, Item **ref)
if (item->type() == Item::FIELD_ITEM) if (item->type() == Item::FIELD_ITEM)
table= ((Item_field *)item)->field->table; table= ((Item_field *)item)->field->table;
allows_multi_table_search &= allows_multi_table_search &= allows_search_on_non_indexed_columns(table);
allows_search_on_non_indexed_columns(((Item_field *)item)->field->table);
} }
/* /*