Skip to content

M
mariadb
Commit 917024b2 authored by 's avatar
Browse files
Options

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

Fixed valgrind failure on PB2.
parents 7e2078c9 fd931d7b
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
sql/log_event.cc
View file @ 917024b2
...@@ -3178,8 +3178,9 @@ compare_errors: ...@@ -3178,8 +3178,9 @@ compare_errors:
has already been dropped. To ignore such irrelevant "table does has already been dropped. To ignore such irrelevant "table does
not exist errors", we silently clear the error if TEMPORARY was used. 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 && if (thd->lex->sql_command == SQLCOM_DROP_TABLE && thd->lex->drop_temporary &&
!expected_error && thd->lex->drop_temporary) thd->is_error() && thd->main_da.sql_errno() == ER_BAD_TABLE_ERROR &&
!expected_error)
thd->main_da.reset_diagnostics_area(); thd->main_da.reset_diagnostics_area();
/* /*
If we expected a non-zero error code, and we don't get the same error If we expected a non-zero error code, and we don't get the same error
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7