Commit 7c76ae4c authored by svoj@april.(none)'s avatar svoj@april.(none)

BUG#16893: Crash in test 'fulltext_order_by'

Fixed that fulltext query + union results in unexpected behaviour.
parent 736faf47
......@@ -1057,9 +1057,6 @@ class Item_func_match :public Item_real_func
{
ft_handler->please->close_search(ft_handler);
ft_handler=0;
if (join_key)
table->file->ft_handler=0;
table->fulltext_searched=0;
}
if (concat)
{
......
......@@ -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);
......
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