summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <Dao-Gang.Qu@sun.com>2010-01-06 10:36:29 +0800
committerunknown <Dao-Gang.Qu@sun.com>2010-01-06 10:36:29 +0800
commit0a64fbc517eef4550e5b0b75246125391f5deca1 (patch)
tree0c0940204a934ec0845fef47ef540a8681e3c687 /sql
parent2b2ce3d6cb01a36cd35191e8670dcb023420c84e (diff)
downloadmariadb-git-0a64fbc517eef4550e5b0b75246125391f5deca1.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')
-rw-r--r--sql/log_event.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc
index 35d53c4fede..ad5c4bfeef8 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -2110,8 +2110,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->net.last_errno == ER_BAD_TABLE_ERROR && !expected_error)
+ if (thd->net.last_errno == ER_BAD_TABLE_ERROR &&
+ !expected_error && thd->lex->drop_temporary)
thd->clear_error();
/*
If we expected a non-zero error code, and we don't get the same error