Commit 59f35ce8 authored by Jimmy Yang's avatar Jimmy Yang

Fix Bug #57616 Sig 11 in dict_load_table() when failed to load

index or foreign key

Approved by Sunny Bains
parent e9eeebc5
...@@ -878,13 +878,13 @@ dict_load_table( ...@@ -878,13 +878,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) {
......
2010-10-20 The InnoDB Team
* dict/dict0load.c
Fix Bug #57616 Sig 11 in dict_load_table() when failed to load
index or foreign key
2010-10-19 The InnoDB Team 2010-10-19 The InnoDB Team
* btr/btr0cur.c, buf/buf0buf.c, buf/buf0flu.c, handler/ha_innodb.cc, * btr/btr0cur.c, buf/buf0buf.c, buf/buf0flu.c, handler/ha_innodb.cc,
......
...@@ -1023,13 +1023,13 @@ dict_load_table( ...@@ -1023,13 +1023,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