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

1170a540 · Sergei Golubchik · 73216f79 · 1170a540
Commit 1170a540 authored May 10, 2014 by Sergei Golubchik
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

sql/item_func.cc sql/item_func.cc +1 -2

No files found.
--- 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);
  }

  /*