From 1170a54060168d885cbf682836342d4fc4ccae1a Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Sat, 10 May 2014 23:42:01 +0200
Subject: [PATCH] fix a bad merge, causing a crash of fulltext.test in
 --ps-protocol

---
 sql/item_func.cc | 3 +--
 1 file changed, 1 insertion(+), 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);
   }
 
   /*