bk commit into 5.1 tree (dlenev:1.2226)

[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
  1.2226 06/03/24 22:56:52 dlenev@stripped +1 -0
  Merge mysql.com:/home/dlenev/mysql-5.0-bg18153
  into  mysql.com:/home/dlenev/mysql-5.1-merges

  sql/sql_table.cc
    1.320 06/03/24 22:56:48 dlenev@stripped +1 -1
    Manual merge.

# 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:	dlenev
# Host:	jabberwock.site
# Root:	/home/dlenev/mysql-5.1-merges/RESYNC

--- 1.319/sql/sql_table.cc	2006-03-24 20:11:56 +03:00
+++ 1.320/sql/sql_table.cc	2006-03-24 22:56:48 +03:00
@@ -3944,6 +3944,7 @@
   uint db_create_options, used_fields;
   handlerton *old_db_type, *new_db_type;
   uint need_copy_table= 0;
+  bool no_table_reopen= FALSE;
 #ifdef WITH_PARTITION_STORAGE_ENGINE
   uint fast_alter_partition= 0;
   bool partition_changed= FALSE;
@@ -4977,6 +4978,7 @@
     table->s->version= 0;                	// Force removal of table def
     close_cached_table(thd, table);
     table=0;					// Marker that table is closed
+    no_table_reopen= TRUE;
   }
 #if (!defined( __WIN__) && !defined( __EMX__) && !defined( OS2))
   else
@@ -5034,7 +5036,7 @@
       goto err;
     }
   }
-  if (thd->lock || new_name != table_name)	// True if WIN32
+  if (thd->lock || new_name != table_name || no_table_reopen)  // True if WIN32
   {
     /*
       Not table locking or alter table with rename.