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-30676 rpl.parallel_backup* tests sometimes fail

Browse Source 
Raise innodb_lock_wait_timeout from 1 to 5
This commit is contained in:
Daniel Black
2024-03-06 15:59:30 +11:00
parent 8bc3241016
commit ea810b04cb
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,7 +124,7 @@ include/save_master_gtid.inc
connection slave; connection slave;
SET @sav_innodb_lock_wait_timeout = @@global.innodb_lock_wait_timeout; SET @sav_innodb_lock_wait_timeout = @@global.innodb_lock_wait_timeout;
SET @sav_slave_transaction_retries = @@global.slave_transaction_retries; SET @sav_slave_transaction_retries = @@global.slave_transaction_retries;
SET @@global.innodb_lock_wait_timeout =1; SET @@global.innodb_lock_wait_timeout =5;
SET @@global.slave_transaction_retries=0; SET @@global.slave_transaction_retries=0;
include/start_slave.inc include/start_slave.inc
connection aux_slave; connection aux_slave;
@ -167,7 +167,7 @@ include/save_master_gtid.inc
connection slave; connection slave;
SET @sav_innodb_lock_wait_timeout = @@global.innodb_lock_wait_timeout; SET @sav_innodb_lock_wait_timeout = @@global.innodb_lock_wait_timeout;
SET @sav_slave_transaction_retries = @@global.slave_transaction_retries; SET @sav_slave_transaction_retries = @@global.slave_transaction_retries;
SET @@global.innodb_lock_wait_timeout =1; SET @@global.innodb_lock_wait_timeout =5;
SET @@global.slave_transaction_retries=0; SET @@global.slave_transaction_retries=0;
include/start_slave.inc include/start_slave.inc
connection aux_slave; connection aux_slave;

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

@ -127,7 +127,7 @@ include/save_master_gtid.inc
connection slave; connection slave;
SET @sav_innodb_lock_wait_timeout = @@global.innodb_lock_wait_timeout; SET @sav_innodb_lock_wait_timeout = @@global.innodb_lock_wait_timeout;
SET @sav_slave_transaction_retries = @@global.slave_transaction_retries; SET @sav_slave_transaction_retries = @@global.slave_transaction_retries;
SET @@global.innodb_lock_wait_timeout =1; SET @@global.innodb_lock_wait_timeout =5;
SET @@global.slave_transaction_retries=0; SET @@global.slave_transaction_retries=0;
include/start_slave.inc include/start_slave.inc
connection aux_slave; connection aux_slave;
@ -170,7 +170,7 @@ include/save_master_gtid.inc
connection slave; connection slave;
SET @sav_innodb_lock_wait_timeout = @@global.innodb_lock_wait_timeout; SET @sav_innodb_lock_wait_timeout = @@global.innodb_lock_wait_timeout;
SET @sav_slave_transaction_retries = @@global.slave_transaction_retries; SET @sav_slave_transaction_retries = @@global.slave_transaction_retries;
SET @@global.innodb_lock_wait_timeout =1; SET @@global.innodb_lock_wait_timeout =5;
SET @@global.slave_transaction_retries=0; SET @@global.slave_transaction_retries=0;
include/start_slave.inc include/start_slave.inc
connection aux_slave; connection aux_slave;

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

@ -127,7 +127,7 @@ include/save_master_gtid.inc
connection slave; connection slave;
SET @sav_innodb_lock_wait_timeout = @@global.innodb_lock_wait_timeout; SET @sav_innodb_lock_wait_timeout = @@global.innodb_lock_wait_timeout;
SET @sav_slave_transaction_retries = @@global.slave_transaction_retries; SET @sav_slave_transaction_retries = @@global.slave_transaction_retries;
SET @@global.innodb_lock_wait_timeout =1; SET @@global.innodb_lock_wait_timeout =5;
SET @@global.slave_transaction_retries=0; SET @@global.slave_transaction_retries=0;
include/start_slave.inc include/start_slave.inc
connection aux_slave; connection aux_slave;
@ -170,7 +170,7 @@ include/save_master_gtid.inc
connection slave; connection slave;
SET @sav_innodb_lock_wait_timeout = @@global.innodb_lock_wait_timeout; SET @sav_innodb_lock_wait_timeout = @@global.innodb_lock_wait_timeout;
SET @sav_slave_transaction_retries = @@global.slave_transaction_retries; SET @sav_slave_transaction_retries = @@global.slave_transaction_retries;
SET @@global.innodb_lock_wait_timeout =1; SET @@global.innodb_lock_wait_timeout =5;
SET @@global.slave_transaction_retries=0; SET @@global.slave_transaction_retries=0;
include/start_slave.inc include/start_slave.inc
connection aux_slave; connection aux_slave;

2
mysql-test/suite/rpl/t/parallel_backup_xa.inc
View File

@ -41,7 +41,7 @@ if ($slave_ooo_error)
{ {
SET @sav_innodb_lock_wait_timeout = @@global.innodb_lock_wait_timeout; SET @sav_innodb_lock_wait_timeout = @@global.innodb_lock_wait_timeout;
SET @sav_slave_transaction_retries = @@global.slave_transaction_retries; SET @sav_slave_transaction_retries = @@global.slave_transaction_retries;
SET @@global.innodb_lock_wait_timeout =1; SET @@global.innodb_lock_wait_timeout =5;
SET @@global.slave_transaction_retries=0; SET @@global.slave_transaction_retries=0;
} }
--source include/start_slave.inc --source include/start_slave.inc