Skip to content

M
MariaDB
Commit 6c2221e4 authored by Jimmy Yang's avatar Jimmy Yang
Browse files
Options

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

parents 3e876844 56c30837
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
storage/innobase/dict/dict0load.c
View file @ 6c2221e4
...@@ -1733,13 +1733,13 @@ dict_load_table( ...@@ -1733,13 +1733,13 @@ dict_load_table(
if (err != DB_SUCCESS) { if (err != DB_SUCCESS) {
dict_table_remove_from_cache(table); dict_table_remove_from_cache(table);
table = NULL; table = NULL;
} else {
table->fk_max_recusive_level = 0;
} }
} else if (!srv_force_recovery) { } else if (!srv_force_recovery) {
dict_table_remove_from_cache(table); dict_table_remove_from_cache(table);
table = NULL; table = NULL;
} }
table->fk_max_recusive_level = 0;
#if 0 #if 0
if (err != DB_SUCCESS && table != NULL) { if (err != DB_SUCCESS && table != NULL) {
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7