From 6f03e15cf958da34b9517a1fc4ae6cf00c80b9de Mon Sep 17 00:00:00 2001 From: Jimmy Yang Date: Thu, 28 Oct 2010 21:55:43 -0700 Subject: [PATCH] Merge fix for bug#57616 from mysql-5.5-security to mysql-5.5-innodb. --- storage/innobase/dict/dict0load.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/innobase/dict/dict0load.c b/storage/innobase/dict/dict0load.c index 74f108fcf8e..9c6fa086d58 100644 --- a/storage/innobase/dict/dict0load.c +++ b/storage/innobase/dict/dict0load.c @@ -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) {