Commit d8f20876 authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

bug with indexless boolean fts and master-slave optimization fixed

parent dcaf8cfc

sql/item_func.cc

+3 −3
Original line number Diff line number Diff line
@@ -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));