diff options
| author | unknown <serg@serg.mysql.com> | 2002-05-07 11:43:25 +0000 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2002-05-07 11:43:25 +0000 |
| commit | 90bd3236370ea78ee3a1e6bc04620093c08d4035 (patch) | |
| tree | 92736f0b65313a6e984203c182ef4599a1d93064 | |
| parent | 3ab427c3b08c6b1b077ca693b416f08cc8a0cec3 (diff) | |
| download | mariadb-git-90bd3236370ea78ee3a1e6bc04620093c08d4035.tar.gz | |
bug with indexless boolean fts and master-slave optimization fixed
| -rw-r--r-- | sql/item_func.cc | 6 |
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)); |