Commit 728bca44 authored by Andrei's avatar Andrei

MDEV-32593 Assertion failure upon CREATE SEQUENCE

A recently added by MDEV-32593 assert conditions are corrected.
parent ef7fc586
...@@ -121,7 +121,10 @@ SET @@global.debug_dbug = ""; ...@@ -121,7 +121,10 @@ SET @@global.debug_dbug = "";
SET @@global.gtid_strict_mode=0; SET @@global.gtid_strict_mode=0;
include/start_slave.inc include/start_slave.inc
connection master; connection master;
DROP SEQUENCE s2,s3; BEGIN;
INSERT INTO ti SET a=32593;
CREATE SEQUENCE s4;
DROP SEQUENCE s2,s3,s4;
DROP TABLE ti; DROP TABLE ti;
connection slave; connection slave;
include/rpl_end.inc include/rpl_end.inc
...@@ -185,7 +185,12 @@ SET debug_sync = RESET; ...@@ -185,7 +185,12 @@ SET debug_sync = RESET;
--source include/start_slave.inc --source include/start_slave.inc
--connection master --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; DROP TABLE ti;
--sync_slave_with_master --sync_slave_with_master
......
...@@ -8025,7 +8025,7 @@ Gtid_log_event::Gtid_log_event(THD *thd_arg, uint64 seq_no_arg, ...@@ -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)); flags2|= (thd_arg->rgi_slave->gtid_ev_flags2 & (FL_DDL|FL_WAITED));
DBUG_ASSERT(thd_arg->lex->sql_command != SQLCOM_CREATE_SEQUENCE || DBUG_ASSERT(thd_arg->lex->sql_command != SQLCOM_CREATE_SEQUENCE ||
(flags2 & FL_DDL)); (flags2 & FL_DDL) || thd_arg->in_multi_stmt_transaction_mode());
} }
......
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