BUG#16893: Crash in test 'fulltext_order_by'

Fixed that fulltext query + union results in unexpected behaviour.

2 files changed, 2 insertions, 3 deletions

diff --git a/sql/item_func.h b/sql/item_func.h
index 2c4976d1152..5bf57a713c4 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -1057,9 +1057,6 @@ public:
     {
       ft_handler->please->close_search(ft_handler);
       ft_handler=0;
-      if (join_key)
-	table->file->ft_handler=0;
-      table->fulltext_searched=0;
     }
     if (concat)
     {
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index ea013bb4e1e..223e8482f49 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -988,6 +988,8 @@ TABLE *open_table(THD *thd,const char *db,const char *table_name,
   table->status=STATUS_NO_RECORD;
   table->keys_in_use_for_query= table->keys_in_use;
   table->used_keys= table->keys_for_keyread;
+  table->file->ft_handler=0;
+  table->fulltext_searched=0;
   if (table->timestamp_field)
     table->timestamp_field_type= table->timestamp_field->get_auto_set_type();
   DBUG_ASSERT(table->key_read == 0);