List:Commits« Previous MessageNext Message »
From:marko.makela Date:November 14 2011 11:06am
Subject:bzr push into mysql-trunk branch (marko.makela:3604 to 3605) Bug#12682554
View as plain text  
 3605 Marko Mäkelä	2011-11-14
      Bug#12682554 FAILED ASSERT AT HANDLER0ALTER.CC IN MANY TESTS
      
      ha_innobase::add_index(): Lock the data dictionary even when dropping
      a created PRIMARY KEY table (new_primary=TRUE). This should fix the assertion
      ut_a(!new_primary || prebuilt->table->n_ref_count == 1);
      
      Approved on IM by Jimmy Yang.

    modified:
      storage/innobase/handler/handler0alter.cc
 3604 chuck.bell@oracle.com	2011-11-11 [merge]
      BUG#12929028 merge from mysql-5.5

    modified:
      client/mysql_plugin.c
=== modified file 'storage/innobase/handler/handler0alter.cc'
--- a/storage/innobase/handler/handler0alter.cc	revid:chuck.bell@stripped
+++ b/storage/innobase/handler/handler0alter.cc	revid:marko.makela@stripped
@@ -963,17 +963,17 @@ error:
 
 		trx->error_state = DB_SUCCESS;
 
+		if (!dict_locked) {
+			row_mysql_lock_data_dictionary(trx);
+			dict_locked = TRUE;
+		}
+
 		if (new_primary) {
 			if (indexed_table != prebuilt->table) {
 				dict_table_close(indexed_table, dict_locked);
 				row_merge_drop_table(trx, indexed_table);
 			}
 		} else {
-			if (!dict_locked) {
-				row_mysql_lock_data_dictionary(trx);
-				dict_locked = TRUE;
-			}
-
 			row_merge_drop_indexes(trx, indexed_table,
 					       index, num_created);
 		}

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (marko.makela:3604 to 3605) Bug#12682554marko.makela14 Nov