bzr commit into mysql-5.1-innodb branch (marko.makela:3411)

[marko.makela]

#At file:///home/marko/innobase/dev/mysql/5.1-innodb/ based on revid:marko.makela@strippedb8um8cms0a

 3411 Marko Mäkelä	2010-04-21
      ha_innobase::add_index(): Only check for duplicate indexes
      when the data dictionary is locked.
      This fixes a UNIV_DEBUG assertion failure in innodb-index.test.

    modified:
      storage/innodb_plugin/handler/handler0alter.cc
=== modified file 'storage/innodb_plugin/handler/handler0alter.cc'
--- a/storage/innodb_plugin/handler/handler0alter.cc	2010-04-06 12:11:46 +0000
+++ b/storage/innodb_plugin/handler/handler0alter.cc	2010-04-21 10:00:29 +0000
@@ -920,9 +920,8 @@ convert_error:
 		trx_commit_for_mysql(prebuilt->trx);
 	}
 
-	ut_d(dict_table_check_for_dup_indexes(innodb_table, FALSE));
-
 	if (dict_locked) {
+		ut_d(dict_table_check_for_dup_indexes(innodb_table, FALSE));
 		row_mysql_unlock_data_dictionary(trx);
 	}
 

Attachment: [text/bzr-bundle] bzr/[e-mail]