database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-32593 Assertion failure upon CREATE SEQUENCE

Browse Source 
A recently added by MDEV-32593 assert conditions are corrected.
This commit is contained in:
Andrei
2023-10-27 11:39:58 +03:00
parent ef7fc586ae
commit 728bca44e8
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/suite/rpl/r/rpl_parallel_seq.result
View File

@ -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

7
mysql-test/suite/rpl/t/rpl_parallel_seq.test
View File

@ -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

2
sql/log_event.cc
View File

@ -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());
} }