bk commit into 4.1 tree (svoj:1.2471) BUG#16893

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
4.1 repository of svoj. When svoj does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2471 06/02/03 14:09:33 svoj@april.(none) +2 -0
  BUG#16893: Crash in test 'fulltext_order_by'
  Fixed that fulltext query + union results in unexpected behaviour.

  sql/sql_base.cc
    1.265 06/02/03 14:09:30 svoj@april.(none) +2 -0
    Reset variables used by fulltext

  sql/item_func.h
    1.128 06/02/03 14:09:30 svoj@april.(none) +0 -3
    Remove access to table object from cleanup() as the table object
    may have been dropped earlier (In case of temporary tables or of
    close_thread_tables() is run before cleanup())
    This fixed a bug with access to already freed memory

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	svoj
# Host:	april.(none)
# Root:	/home/svoj/devel/mysql/BUG16893/mysql-4.1

--- 1.127/sql/item_func.h	2005-11-10 18:12:18 +04:00
+++ 1.128/sql/item_func.h	2006-02-03 14:09:30 +04:00
@@ -1057,9 +1057,6 @@
     {
       ft_handler->please->close_search(ft_handler);
       ft_handler=0;
-      if (join_key)
-	table->file->ft_handler=0;
-      table->fulltext_searched=0;
     }
     if (concat)
     {

--- 1.264/sql/sql_base.cc	2006-01-26 00:25:50 +04:00
+++ 1.265/sql/sql_base.cc	2006-02-03 14:09:30 +04:00
@@ -988,6 +988,8 @@
   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);