Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
728bca44
Commit
728bca44
authored
Oct 27, 2023
by
Andrei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-32593 Assertion failure upon CREATE SEQUENCE
A recently added by MDEV-32593 assert conditions are corrected.
parent
ef7fc586
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
3 deletions
+11
-3
mysql-test/suite/rpl/r/rpl_parallel_seq.result
mysql-test/suite/rpl/r/rpl_parallel_seq.result
+4
-1
mysql-test/suite/rpl/t/rpl_parallel_seq.test
mysql-test/suite/rpl/t/rpl_parallel_seq.test
+6
-1
sql/log_event.cc
sql/log_event.cc
+1
-1
No files found.
mysql-test/suite/rpl/r/rpl_parallel_seq.result
View file @
728bca44
...
@@ -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
mysql-test/suite/rpl/t/rpl_parallel_seq.test
View file @
728bca44
...
@@ -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
...
...
sql/log_event.cc
View file @
728bca44
...
@@ -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
()
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment