diff options
| author | unknown <Dao-Gang.Qu@sun.com> | 2010-01-06 13:28:06 +0800 |
|---|---|---|
| committer | unknown <Dao-Gang.Qu@sun.com> | 2010-01-06 13:28:06 +0800 |
| commit | efcbc34910ba8fd79ad37bae9d0497bafdd05e10 (patch) | |
| tree | b4892df3658e2d52e5cefb095ce56c47a11cd40b /sql/log_event.cc | |
| parent | 8868847109f2e41cc11ed117f22f645a2dfbe2dd (diff) | |
| parent | 98b989d7b1f250f4e245b1ca479bacd9b18ae98e (diff) | |
| download | mariadb-git-efcbc34910ba8fd79ad37bae9d0497bafdd05e10.tar.gz | |
Bug #49137 Replication failure on SBR/MBR + multi-table DROP TEMPORARY TABLE
Fixed valgrind failure on PB2.
sql/log_event.cc:
Added code to fix valgrind failure on PB2.
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 328af4c2a4d..d7eaa57c23b 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -3178,8 +3178,9 @@ 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->is_error() && thd->main_da.sql_errno() == ER_BAD_TABLE_ERROR && - !expected_error && thd->lex->drop_temporary) + if (thd->lex->sql_command == SQLCOM_DROP_TABLE && thd->lex->drop_temporary && + thd->is_error() && thd->main_da.sql_errno() == ER_BAD_TABLE_ERROR && + !expected_error) thd->main_da.reset_diagnostics_area(); /* If we expected a non-zero error code, and we don't get the same error |