diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-06-23 18:15:07 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-07-05 17:15:57 +0200 |
| commit | 9edfc00697b6b97e838d517cdb1883ea115c4746 (patch) | |
| tree | ec6527f0ef8f5d8e060f539900d8aacd5747326e /sql/sql_table.cc | |
| parent | 93a95c0a7637f1e82389b1dba9001a41f43aee8b (diff) | |
| download | mariadb-git-9edfc00697b6b97e838d517cdb1883ea115c4746.tar.gz | |
MDEV-11930 Unexpected ER_ERROR_EVALUATING_EXPRESSION warning upon dropping 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.
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index dcae5435d57..db708ff613c 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -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 || |