Bug #49137 Replication failure on SBR/MBR + multi-table DROP TEMPORARY TABLE

Fixed valgrind failure on PB2.
This commit is contained in:
2010-01-06 10:44:14 +08:00
commit 7e2078c995

View file

@ -3178,8 +3178,8 @@ compare_errors:
has already been dropped. To ignore such irrelevant "table does
not exist errors", we silently clear the error if TEMPORARY was used.
*/
if (thd->lex->drop_temporary && thd->is_error() &&
thd->main_da.sql_errno() == ER_BAD_TABLE_ERROR && !expected_error)
if (thd->is_error() && thd->main_da.sql_errno() == ER_BAD_TABLE_ERROR &&
!expected_error && thd->lex->drop_temporary)
thd->main_da.reset_diagnostics_area();
/*
If we expected a non-zero error code, and we don't get the same error