database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

MDEV-11930 Unexpected ER_ERROR_EVALUATING_EXPRESSION warning upon dropping database with a bad table

Browse Source 
DBUG_EXECUTE_IF was wrong, it used my_error, but didn't do error=1.

It's not clear what it was actually testing, what it was supposed
to be testing, and what it has to do with bug#43138, so I removed it.
This commit is contained in:
Sergei Golubchik
2017-06-23 18:15:07 +02:00
parent 93a95c0a76
commit 9edfc00697
3 changed files with 0 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
mysql-test/r/drop_debug.result
View File

@ -1,25 +0,0 @@
# --
# -- Bug#43138: DROP DATABASE failure does not clean up message list.
# --
DROP DATABASE IF EXISTS mysql_test;
CREATE DATABASE mysql_test;
CREATE TABLE mysql_test.t1(a INT);
CREATE TABLE mysql_test.t2(b INT);
CREATE TABLE mysql_test.t3(c INT);
SET SESSION debug_dbug= "+d,bug43138";
DROP DATABASE mysql_test;
Warnings:
Error 1051 Unknown table 't1'
Error 1051 Unknown table 't2'
Error 1051 Unknown table 't3'
SET SESSION debug_dbug= "-d,bug43138";
# --
# -- End of Bug#43138.
# --

38
mysql-test/t/drop_debug.test
View File

@ -1,38 +0,0 @@
#
# DROP-related tests which execution requires debug server.
#
--source include/have_debug.inc
###########################################################################
--echo
--echo # --
--echo # -- Bug#43138: DROP DATABASE failure does not clean up message list.
--echo # --
--echo
--disable_warnings
DROP DATABASE IF EXISTS mysql_test;
--enable_warnings
--echo
CREATE DATABASE mysql_test;
CREATE TABLE mysql_test.t1(a INT);
CREATE TABLE mysql_test.t2(b INT);
CREATE TABLE mysql_test.t3(c INT);
--echo
SET SESSION debug_dbug= "+d,bug43138";
--echo
--sorted_result
DROP DATABASE mysql_test;
--echo
SET SESSION debug_dbug= "-d,bug43138";
--echo
--echo # --
--echo # -- End of Bug#43138.
--echo # --
###########################################################################

4
sql/sql_table.cc
View File

@ -2522,10 +2522,6 @@ int mysql_rm_table_no_locks(THD *thd, TABLE_LIST *tables, bool if_exists,
DBUG_PRINT("table", ("table: 0x%lx s: 0x%lx", (long) table->table, DBUG_PRINT("table", ("table: 0x%lx s: 0x%lx", (long) table->table,
table->table ? (long) table->table->s : (long) -1)); table->table ? (long) table->table->s : (long) -1));
DBUG_EXECUTE_IF("bug43138",
my_error(ER_BAD_TABLE_ERROR, MYF(0),
table->table_name););
} }
DEBUG_SYNC(thd, "rm_table_no_locks_before_binlog"); DEBUG_SYNC(thd, "rm_table_no_locks_before_binlog");
thd->thread_specific_used|= (trans_tmp_table_deleted || thd->thread_specific_used|= (trans_tmp_table_deleted ||