bk commit into 5.1 tree (dlenev:1.2586)

[dlenev]

Below is the list of changes that have just been committed into a local
5.1 repository of dlenev. When dlenev 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@stripped, 2007-10-25 09:00:15+04:00, dlenev@stripped +2 -0
  Small cleanup. Removed unused TABLE::clear_query_id member
  (we set this flag in one place, but don't use this flag anywhere).

  sql/sql_base.cc@stripped, 2007-10-25 09:00:12+04:00, dlenev@stripped +0 -1
    Removed unused TABLE::clear_query_id member (we set this flag in one
    place, but don't use this flag anywhere).

  sql/table.h@stripped, 2007-10-25 09:00:12+04:00, dlenev@stripped +0 -2
    Removed unused TABLE::clear_query_id member (we set this flag in one
    place, but don't use this flag anywhere).

diff -Nrup a/sql/sql_base.cc b/sql/sql_base.cc
--- a/sql/sql_base.cc	2007-10-11 04:16:46 +04:00
+++ b/sql/sql_base.cc	2007-10-25 09:00:12 +04:00
@@ -2295,7 +2295,6 @@ TABLE *open_table(THD *thd, TABLE_LIST *
 	  DBUG_RETURN(0);
 	}
 	table->query_id= thd->query_id;
-	table->clear_query_id= 1;
 	thd->thread_specific_used= TRUE;
         DBUG_PRINT("info",("Using temporary table"));
         goto reset;
diff -Nrup a/sql/table.h b/sql/table.h
--- a/sql/table.h	2007-08-25 12:43:15 +04:00
+++ b/sql/table.h	2007-10-25 09:00:12 +04:00
@@ -593,8 +593,6 @@ struct st_table {
   my_bool locked_by_name;
   my_bool fulltext_searched;
   my_bool no_cache;
-  /* To signal that we should reset query_id for tables and cols */
-  my_bool clear_query_id;
   /*
     To indicate that a non-null value of the auto_increment field
     was provided by the user or retrieved from the current record.