database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.5' into 10.6

Browse Source
This commit is contained in:
Yuchen Pei
2024-12-17 11:06:09 +11:00
parent c982a143fc 77c9917663
commit 671f80c738
48 changed files with 735 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/rpl/r/rpl_mysqldump_gtid_slave_pos.result
View File

@@ -32,6 +32,7 @@ insert into t1 set a = 2;
insert into t1 set a = 1;
include/save_master_gtid.inc
connection slave;
SET @@global.gtid_cleanup_batch_size = $val;
include/start_slave.inc
include/sync_with_master_gtid.inc
select * from mysql.gtid_slave_pos;
@@ -55,6 +56,7 @@ set statement sql_log_bin=0 for delete from mysql.gtid_slave_pos;
insert into mysql.gtid_slave_pos values (99 + 2, 1, 1, 1);
# 5.
include/rpl_restart_server.inc [server_number=2]
SET @@global.gtid_cleanup_batch_size = $val;
select * from mysql.gtid_slave_pos;
domain_id sub_id server_id seq_no
101 1 1 1
@@ -99,6 +101,7 @@ set statement sql_log_bin=0 for delete from mysql.gtid_slave_pos;
insert into mysql.gtid_slave_pos values (99 + 1, 1, 1, 1);
# 5.
include/rpl_restart_server.inc [server_number=2]
SET @@global.gtid_cleanup_batch_size = $val;
select * from mysql.gtid_slave_pos;
domain_id sub_id server_id seq_no
100 1 1 1
@@ -145,5 +148,6 @@ connection master;
DROP TABLE t1;
include/save_master_gtid.inc
connection slave;
SET @@global.gtid_cleanup_batch_size= $old_gtid_cleanup_batch_size;
include/sync_with_master_gtid.inc
include/rpl_end.inc

8
mysql-test/suite/rpl/t/rpl_mysqldump_gtid_slave_pos.test
View File

@@ -47,6 +47,12 @@ while ($i)
--source include/save_master_gtid.inc
--connection slave
# enforce determistic SELECT * from mysql.gtid_slave_pos
--let $old_gtid_cleanup_batch_size = `select @@GLOBAL.gtid_cleanup_batch_size`
# the number of generated transactions on master must not exceed this value:
--let $val= 2147483647
--evalp SET @@global.gtid_cleanup_batch_size = $val
--source include/start_slave.inc
--source include/sync_with_master_gtid.inc
# Prior tests in a mtr batch could leave the min value of sub_id column with
@@ -85,6 +91,7 @@ while ($i)
--echo # 5.
--let $rpl_server_number= 2
--source include/rpl_restart_server.inc
--evalp SET @@global.gtid_cleanup_batch_size = $val
select * from mysql.gtid_slave_pos;
select @@global.gtid_slave_pos as "before dump restore";
--let $dump=dump_$i.sql
@@ -130,6 +137,7 @@ DROP TABLE t1;
--source include/save_master_gtid.inc
--connection slave
--evalp SET @@global.gtid_cleanup_batch_size= $old_gtid_cleanup_batch_size
--remove_files_wildcard $MYSQLTEST_VARDIR/tmp dump_*.sql
--source include/sync_with_master_gtid.inc