Commit 486e6e6a authored by Vasil Dimov's avatar Vasil Dimov

Merge mysql-trunk-innodb from bk-internal into my local branch

parents 6941bfb6 63657524
...@@ -2120,9 +2120,12 @@ row_merge_drop_temp_indexes(void) ...@@ -2120,9 +2120,12 @@ row_merge_drop_temp_indexes(void)
if (table) { if (table) {
dict_index_t* index; dict_index_t* index;
dict_index_t* next_index;
for (index = dict_table_get_first_index(table); for (index = dict_table_get_first_index(table);
index; index = dict_table_get_next_index(index)) { index; index = next_index) {
next_index = dict_table_get_next_index(index);
if (*index->name == TEMP_INDEX_PREFIX) { if (*index->name == TEMP_INDEX_PREFIX) {
row_merge_drop_index(index, table, trx); row_merge_drop_index(index, table, trx);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment