summaryrefslogtreecommitdiff
path: root/sql/sql_table.cc
diff options
context:
space:
mode:
authorRamil Kalimullin <ramil@mysql.com>2009-07-06 11:55:53 +0500
committerRamil Kalimullin <ramil@mysql.com>2009-07-06 11:55:53 +0500
commit381da0c9d807ba6347b3802b1bad9dca07c3f3f0 (patch)
treef8114d82f4cc82dd965c4aa6cf18a2e00ba259cc /sql/sql_table.cc
parent7f1715a7c7645e89306303418f05e9a6d056f5a1 (diff)
downloadmariadb-git-381da0c9d807ba6347b3802b1bad9dca07c3f3f0.tar.gz
Fix for bug#42364 reverted.
Diffstat (limited to 'sql/sql_table.cc')
-rw-r--r--sql/sql_table.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 813a0472b76..e752421223a 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -1995,7 +1995,6 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
pthread_mutex_unlock(&LOCK_open);
thd->thread_specific_used|= tmp_table_deleted;
error= 0;
- thd->no_warnings_for_error= 0;
if (wrong_tables.length())
{
if (!foreign_key_error)
@@ -2057,6 +2056,7 @@ int mysql_rm_table_part2(THD *thd, TABLE_LIST *tables, bool if_exists,
err_with_placeholders:
unlock_table_names(thd, tables, (TABLE_LIST*) 0);
pthread_mutex_unlock(&LOCK_open);
+ thd->no_warnings_for_error= 0;
DBUG_RETURN(error);
}