List:Commits« Previous MessageNext Message »
From:dlenev Date:March 24 2006 5:12pm
Subject:bk commit into 5.1 tree (dlenev:1.2225)
View as plain text  
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.2225 06/03/24 20:12:03 dlenev@stripped +1 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
  into  mysql.com:/home/dlenev/mysql-5.1-merges

  sql/sql_table.cc
    1.319 06/03/24 20:11:56 dlenev@stripped +0 -0
    Auto merged

# 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.318/sql/sql_table.cc	2006-03-25 02:21:33 +03:00
+++ 1.319/sql/sql_table.cc	2006-03-24 20:11:56 +03:00
@@ -4974,7 +4974,6 @@
       Win32 and InnoDB can't drop a table that is in use, so we must
       close the original table at before doing the rename
     */
-    table_name=thd->strdup(table_name);		// must be saved
     table->s->version= 0;                	// Force removal of table def
     close_cached_table(thd, table);
     table=0;					// Marker that table is closed
Thread
bk commit into 5.1 tree (dlenev:1.2225)dlenev24 Mar