Skip to content

Commit

Permalink
MDEV-11930 Unexpected ER_ERROR_EVALUATING_EXPRESSION warning upon dro…
Browse files Browse the repository at this point in the history
…pping database with a bad table

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.
  • Loading branch information
vuvova committed Jul 5, 2017
1 parent 93a95c0 commit 9edfc00
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 67 deletions.
25 changes: 0 additions & 25 deletions mysql-test/r/drop_debug.result

This file was deleted.

38 changes: 0 additions & 38 deletions mysql-test/t/drop_debug.test

This file was deleted.

4 changes: 0 additions & 4 deletions sql/sql_table.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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,
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");
thd->thread_specific_used|= (trans_tmp_table_deleted ||
Expand Down

0 comments on commit 9edfc00

Please sign in to comment.