Commit 16c564a3 authored by unknown's avatar unknown
Browse files

Merge april.(none):/home/svoj/devel/mysql/BUG16893/mysql-4.1 

into  april.(none):/home/svoj/devel/mysql/merge/mysql-4.1


sql/item_func.h:
  Auto merged
parents 0b927000 394c88df

sql/item_func.h

+0 −3
Original line number Diff line number Diff line
@@ -1056,9 +1056,6 @@ class Item_func_match :public Item_real_func 
    if (!master && ft_handler)

    {

      ft_handler->please->close_search(ft_handler);

      if (join_key)

	table->file->ft_handler=0;

      table->fulltext_searched=0;

    }

    if (concat)

    {

sql/sql_base.cc

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