Skip to content

Commit bca366e

Browse files
mariadb-YuchenPeimariadb-YuchenPei
committed
MDEV-34098 source start_slave.inc in spider suites
The spider suite should --source include/start_slave.inc to make sure the slave is up before proceeding.
1 parent 89084c2 commit bca366e

21 files changed

+21
-3
lines changed

‎storage/spider/mysql-test/spider/bg/r/spider3_fixes.result‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ child3_1
88
child3_2
99
child3_3
1010
for slave1_1
11+
include/start_slave.inc
1112

1213
drop and create databases
1314
connection master_1;

‎storage/spider/mysql-test/spider/bg/r/spider3_fixes_part.result‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ child3_1
88
child3_2
99
child3_3
1010
for slave1_1
11+
include/start_slave.inc
1112

1213
drop and create databases
1314
connection master_1;

‎storage/spider/mysql-test/spider/bg/r/spider_fixes.result‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ child3_1
88
child3_2
99
child3_3
1010
for slave1_1
11+
include/start_slave.inc
1112

1213
drop and create databases
1314
connection master_1;

‎storage/spider/mysql-test/spider/bg/r/spider_fixes_part.result‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ child3_1
88
child3_2
99
child3_3
1010
for slave1_1
11+
include/start_slave.inc
1112

1213
drop and create databases
1314
connection master_1;

‎storage/spider/mysql-test/spider/bg/t/slave_test_init.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ if (!$SLAVE1_1_SLAVE_STATUS)
1919
MASTER_PORT = $MASTER_1_MYPORT
2020
;
2121
}
22-
START SLAVE;
22+
--source include/start_slave.inc
2323
--connection master_1
2424
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
2525
--connection slave1_1

‎storage/spider/mysql-test/spider/bugfix/r/delete_with_float_column_mariadb.result‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ child2_2
55
child2_3
66
for child3
77
for slave1_1
8+
include/start_slave.inc
89
connection slave1_1;
910
connection master_1;
1011
set @old_binlog_format= @@binlog_format;

‎storage/spider/mysql-test/spider/bugfix/r/delete_with_float_column_mysql.result‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ child2_2
55
child2_3
66
for child3
77
for slave1_1
8+
include/start_slave.inc
89
connection slave1_1;
910
connection master_1;
1011
set @old_binlog_format= @@binlog_format;

‎storage/spider/mysql-test/spider/bugfix/r/slave_transaction_retry_errors_5digit.result‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ child2_2
55
child2_3
66
for child3
77
for slave1_1
8+
include/start_slave.inc
89

910
connection slave1_1;
1011
SHOW VARIABLES LIKE 'slave_transaction_retry_errors';

‎storage/spider/mysql-test/spider/bugfix/r/slave_trx_isolation.result‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ child2_2
55
child2_3
66
for child3
77
for slave1_1
8+
include/start_slave.inc
89
connection slave1_1;
910
set @old_spider_slave_trx_isolation= @@spider_slave_trx_isolation;
1011
set global spider_slave_trx_isolation= 1;

‎storage/spider/mysql-test/spider/feature/r/slave_transaction_retry_errors.result‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ child2_2
55
child2_3
66
for child3
77
for slave1_1
8+
include/start_slave.inc
89

910
connection slave1_1;
1011
SHOW VARIABLES LIKE 'slave_transaction_retry_errors';

0 commit comments

Comments
 (0)