List:Commits« Previous MessageNext Message »
From:kevin.lewis Date:February 27 2013 10:33pm
Subject:bzr push into mysql-trunk branch (kevin.lewis:5181 to 5182)
View as plain text  
 5182 kevin.lewis@stripped	2013-02-27 [merge]
      Merge from mysql-5.6.

    modified:
      storage/innobase/handler/ha_innodb.cc
 5181 kevin.lewis@stripped	2013-02-27 [merge]
      Merge Bug#16305265 from mysql-5.6 to mysql-trunk

    modified:
      storage/innobase/fts/fts0pars.cc
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/include/trx0trx.h
      storage/innobase/row/row0mysql.cc
      storage/innobase/srv/srv0srv.cc
=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- a/storage/innobase/handler/ha_innodb.cc	revid:kevin.lewis@stripped
+++ b/storage/innobase/handler/ha_innodb.cc	revid:kevin.lewis@stripped
@@ -10136,7 +10136,7 @@ innobase_rename_table(
 
 	DEBUG_SYNC_C("innodb_rename_table_ready");
 
-	trx_start_for_ddl(trx, TRX_DICT_OP_INDEX);
+	trx_start_if_not_started(trx);
 
 	/* Serialize data dictionary operations with dictionary mutex:
 	no deadlocks can occur then in these operations. */

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (kevin.lewis:5181 to 5182) kevin.lewis4 Apr