summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r--sql/item_func.cc6
1 files 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));