From 728bca44e892d70f2cbc2746b89389d561c0e710 Mon Sep 17 00:00:00 2001 From: Andrei Date: Fri, 27 Oct 2023 11:39:58 +0300 Subject: [PATCH] MDEV-32593 Assertion failure upon CREATE SEQUENCE A recently added by MDEV-32593 assert conditions are corrected. --- mysql-test/suite/rpl/r/rpl_parallel_seq.result | 5 ++++- mysql-test/suite/rpl/t/rpl_parallel_seq.test | 7 ++++++- sql/log_event.cc | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/mysql-test/suite/rpl/r/rpl_parallel_seq.result b/mysql-test/suite/rpl/r/rpl_parallel_seq.result index fdb6bfef724..2746aaaf8a5 100644 --- a/mysql-test/suite/rpl/r/rpl_parallel_seq.result +++ b/mysql-test/suite/rpl/r/rpl_parallel_seq.result @@ -121,7 +121,10 @@ SET @@global.debug_dbug = ""; SET @@global.gtid_strict_mode=0; include/start_slave.inc connection master; -DROP SEQUENCE s2,s3; +BEGIN; +INSERT INTO ti SET a=32593; +CREATE SEQUENCE s4; +DROP SEQUENCE s2,s3,s4; DROP TABLE ti; connection slave; include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_parallel_seq.test b/mysql-test/suite/rpl/t/rpl_parallel_seq.test index ecc29de779b..4c4e8297587 100644 --- a/mysql-test/suite/rpl/t/rpl_parallel_seq.test +++ b/mysql-test/suite/rpl/t/rpl_parallel_seq.test @@ -185,7 +185,12 @@ SET debug_sync = RESET; --source include/start_slave.inc --connection master -DROP SEQUENCE s2,s3; +# MDEV-32593 Assertion failure upon CREATE SEQUENCE +BEGIN; +INSERT INTO ti SET a=32593; +CREATE SEQUENCE s4; + +DROP SEQUENCE s2,s3,s4; DROP TABLE ti; --sync_slave_with_master diff --git a/sql/log_event.cc b/sql/log_event.cc index 7c791a4b6f5..10bf569d636 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -8025,7 +8025,7 @@ Gtid_log_event::Gtid_log_event(THD *thd_arg, uint64 seq_no_arg, flags2|= (thd_arg->rgi_slave->gtid_ev_flags2 & (FL_DDL|FL_WAITED)); DBUG_ASSERT(thd_arg->lex->sql_command != SQLCOM_CREATE_SEQUENCE || - (flags2 & FL_DDL)); + (flags2 & FL_DDL) || thd_arg->in_multi_stmt_transaction_mode()); }