mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 02:30:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  april.(none):/home/svoj/devel/mysql/merge/mysql-4.1
This commit is contained in:
svoj@april.(none) 2006-02-07 13:49:55 +04:00
commit 91296df576
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sql/item_func.h
View file

@ -1056,9 +1056,6 @@ public:
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)
{

2
sql/sql_base.cc
View file

@ -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);