summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@oracle.com>2010-04-21 13:00:29 +0300
committerMarko Mäkelä <marko.makela@oracle.com>2010-04-21 13:00:29 +0300
commit8c65e887a02b4535f5820496b316bd7c96ceff9f (patch)
tree2a92dcfde2f22f4cf27ce793afdefe10fac63d7e /storage
parent8c828e3afdf3868fe9b6bab4ce5d60b1d63e731d (diff)
downloadmariadb-git-8c65e887a02b4535f5820496b316bd7c96ceff9f.tar.gz
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.
Diffstat (limited to 'storage')
-rw-r--r--storage/innodb_plugin/handler/handler0alter.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/innodb_plugin/handler/handler0alter.cc b/storage/innodb_plugin/handler/handler0alter.cc
index 9836fb11ebc..e474c318c58 100644
--- a/storage/innodb_plugin/handler/handler0alter.cc
+++ b/storage/innodb_plugin/handler/handler0alter.cc
@@ -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);
}