summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei <andrei.elkin@mariadb.com>2022-01-18 14:24:43 +0200
committerAndrei <andrei.elkin@mariadb.com>2022-01-18 14:24:43 +0200
commit06e230665cc16204eeffb8c8942e10a1788e6a08 (patch)
tree9a46c379ebc5f63972038cbd78e5ed0ea350f854
parentaec1b43a3945de09352bb1de956a0df38420d171 (diff)
downloadmariadb-git-06e230665cc16204eeffb8c8942e10a1788e6a08.tar.gz
MDEV-27365 this commit covers ALTER sequence
This is 2nd amendment commit that covers ALTER.
-rw-r--r--mysql-test/suite/binlog/r/binlog_parallel_replication_ddl.result5
-rw-r--r--mysql-test/suite/binlog/t/binlog_parallel_replication_ddl.test1
-rw-r--r--sql/sql_sequence.cc2
3 files changed, 5 insertions, 3 deletions
diff --git a/mysql-test/suite/binlog/r/binlog_parallel_replication_ddl.result b/mysql-test/suite/binlog/r/binlog_parallel_replication_ddl.result
index 606562e853b..71b9730f1ee 100644
--- a/mysql-test/suite/binlog/r/binlog_parallel_replication_ddl.result
+++ b/mysql-test/suite/binlog/r/binlog_parallel_replication_ddl.result
@@ -1,9 +1,10 @@
RESET MASTER;
CREATE OR REPLACE SEQUENCE s1;
CREATE OR REPLACE SEQUENCE s1;
+ALTER SEQUENCE s1 MINVALUE = 1;
DROP SEQUENCE s1;
FLUSH LOGS;
-FOUND 3 /GTID [0-9]+-[0-9]+-[0-9]+/ in mysqlbinlog.sql
+FOUND 4 /GTID [0-9]+-[0-9]+-[0-9]+/ in mysqlbinlog.sql
The same as above number of samples must be found:
-FOUND 3 /GTID [0-9]+-[0-9]+-[0-9]+ ddl/ in mysqlbinlog.sql
+FOUND 4 /GTID [0-9]+-[0-9]+-[0-9]+ ddl/ in mysqlbinlog.sql
End of the tests
diff --git a/mysql-test/suite/binlog/t/binlog_parallel_replication_ddl.test b/mysql-test/suite/binlog/t/binlog_parallel_replication_ddl.test
index 0ebff987292..7c62ac74bea 100644
--- a/mysql-test/suite/binlog/t/binlog_parallel_replication_ddl.test
+++ b/mysql-test/suite/binlog/t/binlog_parallel_replication_ddl.test
@@ -10,6 +10,7 @@ RESET MASTER;
# Prove it is logged with the DDL flag.
CREATE OR REPLACE SEQUENCE s1;
CREATE OR REPLACE SEQUENCE s1;
+ALTER SEQUENCE s1 MINVALUE = 1;
# This one has been always correct.
DROP SEQUENCE s1;
diff --git a/sql/sql_sequence.cc b/sql/sql_sequence.cc
index 0aedcbfeb4e..0648cd7d092 100644
--- a/sql/sql_sequence.cc
+++ b/sql/sql_sequence.cc
@@ -982,7 +982,7 @@ bool Sql_cmd_alter_sequence::execute(THD *thd)
seq->write_unlock(table);
if (trans_commit_stmt(thd))
error= 1;
- if (trans_commit_implicit(thd))
+ if (trans_commit_implicit(thd, true))
error= 1;
if (likely(!error))
error= write_bin_log(thd, 1, thd->query(), thd->query_length());