Commit 90bd3236 authored by unknown's avatar unknown

bug with indexless boolean fts and master-slave optimization fixed

parent 3ab427c3
...@@ -2039,6 +2039,9 @@ void Item_func_match::init_search(bool no_order) ...@@ -2039,6 +2039,9 @@ void Item_func_match::init_search(bool no_order)
if (ft_handler) if (ft_handler)
return; return;
if (key == NO_SUCH_KEY)
concat=new Item_func_concat_ws (new Item_string(" ",1), fields);
if (master) if (master)
{ {
join_key=master->join_key=join_key|master->join_key; join_key=master->join_key=join_key|master->join_key;
...@@ -2048,9 +2051,6 @@ void Item_func_match::init_search(bool no_order) ...@@ -2048,9 +2051,6 @@ void Item_func_match::init_search(bool no_order)
return; return;
} }
if (key == NO_SUCH_KEY)
concat=new Item_func_concat_ws (new Item_string(" ",1), fields);
String *ft_tmp=0; String *ft_tmp=0;
char tmp1[FT_QUERY_MAXLEN]; char tmp1[FT_QUERY_MAXLEN];
String tmp2(tmp1,sizeof(tmp1)); String tmp2(tmp1,sizeof(tmp1));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment