Merge fix for bug#57616 from mysql-5.5-security to mysql-5.5-innodb.

This commit is contained in:
Jimmy Yang 2010-10-28 21:55:43 -07:00
parent e3decfa0ae
commit 6f03e15cf9

View File

@ -1733,13 +1733,13 @@ err_exit:
if (err != DB_SUCCESS) {
dict_table_remove_from_cache(table);
table = NULL;
} else {
table->fk_max_recusive_level = 0;
}
} else if (!srv_force_recovery) {
dict_table_remove_from_cache(table);
table = NULL;
}
table->fk_max_recusive_level = 0;
#if 0
if (err != DB_SUCCESS && table != NULL) {