bk commit into 5.1 tree (kostja:1.2576)

[konstantin]

Below is the list of changes that have just been committed into a local
5.1 repository of kostja. When kostja 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-07-31 20:52:43+04:00, kostja@bodhi.(none) +1 -0
  Post-merge fixes.

  sql/sql_base.cc@stripped, 2007-07-31 20:52:36+04:00, kostja@bodhi.(none) +2 -2
    Fix an incorrect manual merge.

diff -Nrup a/sql/sql_base.cc b/sql/sql_base.cc
--- a/sql/sql_base.cc	2007-07-31 20:00:02 +04:00
+++ b/sql/sql_base.cc	2007-07-31 20:52:36 +04:00
@@ -1701,18 +1701,18 @@ TABLE *find_temporary_table(THD *thd, TA
   @retval FALSE  the table was found and dropped successfully.
 */
 
-bool close_temporary_table(THD *thd, const char *db, const char *table_name)
+bool close_temporary_table(THD *thd, TABLE_LIST *table_list)
 {
   TABLE *table;
 
   if (!(table= find_temporary_table(thd, table_list)))
     return 1;
-  close_temporary_table(thd, table, 1, 1);
   /*
     If LOCK TABLES list is not empty and contains this table,
     unlock the table and remove the table from this list.
   */
   mysql_lock_remove(thd, thd->locked_tables, table, FALSE);
+  close_temporary_table(thd, table, 1, 1);
   return 0;
 }