Merge from mysql-5.1-security to mysql-5.5-security.

This commit is contained in:
Jimmy Yang 2010-10-20 19:24:56 -07:00
commit 6c2221e401

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) {