From 90bd3236370ea78ee3a1e6bc04620093c08d4035 Mon Sep 17 00:00:00 2001
From: unknown <serg@serg.mysql.com>
Date: Tue, 7 May 2002 11:43:25 +0000
Subject: bug with indexless boolean fts and master-slave optimization fixed

---
 sql/item_func.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sql/item_func.cc b/sql/item_func.cc
index 09631b52cf6..cffa92919ba 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -2039,6 +2039,9 @@ void Item_func_match::init_search(bool no_order)
   if (ft_handler)
     return;
 
+  if (key == NO_SUCH_KEY)
+    concat=new Item_func_concat_ws (new Item_string(" ",1), fields);
+
   if (master)
   {
     join_key=master->join_key=join_key|master->join_key;
@@ -2048,9 +2051,6 @@ void Item_func_match::init_search(bool no_order)
     return;
   }
 
-  if (key == NO_SUCH_KEY)
-    concat=new Item_func_concat_ws (new Item_string(" ",1), fields);
-
   String *ft_tmp=0;
   char tmp1[FT_QUERY_MAXLEN];
   String tmp2(tmp1,sizeof(tmp1));
-- 
cgit v1.2.1