Merge branch '5.5' into 10.0

This commit is contained in:
Vicențiu Ciorbaru 2017-03-03 01:37:54 +02:00
commit 1acfa942ed
154 changed files with 3475 additions and 1793 deletions

View file

@ -6156,7 +6156,6 @@ dict_set_corrupted(
row_mysql_lock_data_dictionary(trx);
}
ut_ad(index);
ut_ad(mutex_own(&dict_sys->mutex));
ut_ad(!dict_table_is_comp(dict_sys->sys_tables));
ut_ad(!dict_table_is_comp(dict_sys->sys_indexes));