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 10.6 into 10.11

Browse Source
This commit is contained in:
Marko Mäkelä
2025-03-27 08:01:47 +02:00
parent ba81009f63 191209d8ab
commit ab0f2a00b6
463 changed files with 4278 additions and 1958 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/rpl/r/parallel_backup_xa_debug.result
View File

@@ -4,6 +4,7 @@ connection master;
CREATE TABLE t (a INT) ENGINE = innodb;
connection slave;
include/stop_slave.inc
SET STATEMENT sql_log_bin= 0 FOR ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB;
SET @old_parallel_threads= @@GLOBAL.slave_parallel_threads;
SET @old_parallel_mode = @@GLOBAL.slave_parallel_mode;
SET @@global.slave_parallel_threads= 2;
@@ -19,6 +20,7 @@ xa prepare 'x';
connection slave;
SET @@global.debug_dbug="+d,hold_worker_on_schedule";
start slave;
SET debug_sync = 'now WAIT_FOR reached_pause';
connection slave1;
backup stage start;
backup stage block_commit;

2
mysql-test/suite/rpl/r/rpl_gtid_crash.result
View File

@@ -12,6 +12,8 @@ INSERT INTO t1 VALUES (1, 0);
connection server_2;
SET sql_log_bin=0;
call mtr.add_suppression('Master command COM_REGISTER_SLAVE failed: failed registering on master, reconnecting to try again');
call mtr.add_suppression('Slave I/O: .*Lost connection to server during query');
call mtr.add_suppression("Slave I/O thread couldn't register on master");
SET sql_log_bin=1;
include/stop_slave.inc
CHANGE MASTER TO master_host = '127.0.0.1', master_port = MASTER_PORT,

6
mysql-test/suite/rpl/t/parallel_backup_xa_debug.test
View File

@@ -11,6 +11,7 @@ CREATE TABLE t (a INT) ENGINE = innodb;
--sync_slave_with_master
--source include/stop_slave.inc
SET STATEMENT sql_log_bin= 0 FOR ALTER TABLE mysql.gtid_slave_pos ENGINE=InnoDB;
SET @old_parallel_threads= @@GLOBAL.slave_parallel_threads;
SET @old_parallel_mode = @@GLOBAL.slave_parallel_mode;
SET @@global.slave_parallel_threads= 2;
@@ -28,20 +29,21 @@ xa prepare 'x';
--connection slave
SET @@global.debug_dbug="+d,hold_worker_on_schedule";
start slave;
SET debug_sync = 'now WAIT_FOR reached_pause';
--let $wait_condition= SELECT count(*) = 1 FROM information_schema.processlist WHERE state LIKE "Waiting for prior transaction to commit"
--source include/wait_condition.inc
--connection slave1
backup stage start;
--send backup stage block_commit
backup stage block_commit;
--connection slave
--let $wait_condition= SELECT count(*) = 1 FROM information_schema.processlist WHERE state LIKE "Waiting for backup lock"
SET debug_sync = 'now SIGNAL continue_worker';
--source include/wait_condition.inc
SET debug_sync = RESET;
--connection slave1
reap;
backup stage end;
--connection master

2
mysql-test/suite/rpl/t/rpl_gtid_crash-slave.opt
View File

@@ -1 +1 @@
--master-retry-count=100 --slave-net-timeout=10
--master-retry-count=500 --slave-net-timeout=10

2
mysql-test/suite/rpl/t/rpl_gtid_crash.test
View File

@@ -24,6 +24,8 @@ INSERT INTO t1 VALUES (1, 0);
--sync_with_master
SET sql_log_bin=0;
call mtr.add_suppression('Master command COM_REGISTER_SLAVE failed: failed registering on master, reconnecting to try again');
call mtr.add_suppression('Slave I/O: .*Lost connection to server during query');
call mtr.add_suppression("Slave I/O thread couldn't register on master");
SET sql_log_bin=1;
--source include/stop_slave.inc
--replace_result $MASTER_MYPORT MASTER_PORT

1
mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
View File

@@ -9,6 +9,7 @@
# * Various states of master and heartbeat
# * Circular replication
#############################################################
--source include/long_test.inc
--source include/master-slave.inc
#
# The test runs long and does not have any specifics to

1
mysql-test/suite/rpl/t/rpl_row_drop_create_temp_table.test
View File

@@ -3,6 +3,7 @@
# tables. Specifically when drop temporary tables and create temporary tables
# are used.
###################################################################################
--source include/long_test.inc
--source include/have_binlog_format_row.inc
--source include/have_innodb.inc
--source include/master-slave.inc

1
mysql-test/suite/rpl/t/rpl_semi_sync.test
View File

@@ -4,6 +4,7 @@
# Please check all dependent tests after modifying it
#
source include/long_test.inc;
source include/not_embedded.inc;
source include/have_innodb.inc;
source include/master-slave.inc;

1
mysql-test/suite/rpl/t/rpl_semi_sync_after_sync.test
View File

@@ -1,3 +1,4 @@
--source include/long_test.inc
--source include/have_binlog_format_statement.inc
set global rpl_semi_sync_master_wait_point=AFTER_SYNC;
source rpl_semi_sync.test;

1
mysql-test/suite/rpl/t/rpl_semi_sync_after_sync_row.test
View File

@@ -1,3 +1,4 @@
--source include/long_test.inc
--source include/have_binlog_format_row.inc
set global rpl_semi_sync_master_wait_point=AFTER_SYNC;
source rpl_semi_sync.test;

1
mysql-test/suite/rpl/t/rpl_typeconv.test
View File

@@ -4,6 +4,7 @@
# Please check all dependent tests after modifying it
#
--source include/long_test.inc
--source include/have_binlog_format_row.inc
--source include/master-slave.inc