Skip to content

M
MariaDB
Commit bca366e4 authored by Yuchen Pei's avatar Yuchen Pei
Browse files
Options

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.
parent 89084c2e
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 3 deletions
storage/spider/mysql-test/spider/bg/r/spider3_fixes.result
View file @ bca366e4
...@@ -8,6 +8,7 @@ child3_1 ...@@ -8,6 +8,7 @@ child3_1
child3_2 child3_2
child3_3 child3_3
for slave1_1 for slave1_1
include/start_slave.inc
drop and create databases drop and create databases
connection master_1; connection master_1;
......
storage/spider/mysql-test/spider/bg/r/spider3_fixes_part.result
View file @ bca366e4
...@@ -8,6 +8,7 @@ child3_1 ...@@ -8,6 +8,7 @@ child3_1
child3_2 child3_2
child3_3 child3_3
for slave1_1 for slave1_1
include/start_slave.inc
drop and create databases drop and create databases
connection master_1; connection master_1;
......
storage/spider/mysql-test/spider/bg/r/spider_fixes.result
View file @ bca366e4
...@@ -8,6 +8,7 @@ child3_1 ...@@ -8,6 +8,7 @@ child3_1
child3_2 child3_2
child3_3 child3_3
for slave1_1 for slave1_1
include/start_slave.inc
drop and create databases drop and create databases
connection master_1; connection master_1;
......
storage/spider/mysql-test/spider/bg/r/spider_fixes_part.result
View file @ bca366e4
...@@ -8,6 +8,7 @@ child3_1 ...@@ -8,6 +8,7 @@ child3_1
child3_2 child3_2
child3_3 child3_3
for slave1_1 for slave1_1
include/start_slave.inc
drop and create databases drop and create databases
connection master_1; connection master_1;
......
storage/spider/mysql-test/spider/bg/t/slave_test_init.inc
View file @ bca366e4
...@@ -19,7 +19,7 @@ if (!$SLAVE1_1_SLAVE_STATUS) ...@@ -19,7 +19,7 @@ if (!$SLAVE1_1_SLAVE_STATUS)
MASTER_PORT = $MASTER_1_MYPORT MASTER_PORT = $MASTER_1_MYPORT
; ;
} }
START SLAVE; --source include/start_slave.inc
--connection master_1 --connection master_1
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
--connection slave1_1 --connection slave1_1
......
storage/spider/mysql-test/spider/bugfix/r/delete_with_float_column_mariadb.result
View file @ bca366e4
...@@ -5,6 +5,7 @@ child2_2 ...@@ -5,6 +5,7 @@ child2_2
child2_3 child2_3
for child3 for child3
for slave1_1 for slave1_1
include/start_slave.inc
connection slave1_1; connection slave1_1;
connection master_1; connection master_1;
set @old_binlog_format= @@binlog_format; set @old_binlog_format= @@binlog_format;
......
storage/spider/mysql-test/spider/bugfix/r/delete_with_float_column_mysql.result
View file @ bca366e4
...@@ -5,6 +5,7 @@ child2_2 ...@@ -5,6 +5,7 @@ child2_2
child2_3 child2_3
for child3 for child3
for slave1_1 for slave1_1
include/start_slave.inc
connection slave1_1; connection slave1_1;
connection master_1; connection master_1;
set @old_binlog_format= @@binlog_format; set @old_binlog_format= @@binlog_format;
......
storage/spider/mysql-test/spider/bugfix/r/slave_transaction_retry_errors_5digit.result
View file @ bca366e4
...@@ -5,6 +5,7 @@ child2_2 ...@@ -5,6 +5,7 @@ child2_2
child2_3 child2_3
for child3 for child3
for slave1_1 for slave1_1
include/start_slave.inc
connection slave1_1; connection slave1_1;
SHOW VARIABLES LIKE 'slave_transaction_retry_errors'; SHOW VARIABLES LIKE 'slave_transaction_retry_errors';
......
storage/spider/mysql-test/spider/bugfix/r/slave_trx_isolation.result
View file @ bca366e4
...@@ -5,6 +5,7 @@ child2_2 ...@@ -5,6 +5,7 @@ child2_2
child2_3 child2_3
for child3 for child3
for slave1_1 for slave1_1
include/start_slave.inc
connection slave1_1; connection slave1_1;
set @old_spider_slave_trx_isolation= @@spider_slave_trx_isolation; set @old_spider_slave_trx_isolation= @@spider_slave_trx_isolation;
set global spider_slave_trx_isolation= 1; set global spider_slave_trx_isolation= 1;
......
storage/spider/mysql-test/spider/feature/r/slave_transaction_retry_errors.result
View file @ bca366e4
...@@ -5,6 +5,7 @@ child2_2 ...@@ -5,6 +5,7 @@ child2_2
child2_3 child2_3
for child3 for child3
for slave1_1 for slave1_1
include/start_slave.inc
connection slave1_1; connection slave1_1;
SHOW VARIABLES LIKE 'slave_transaction_retry_errors'; SHOW VARIABLES LIKE 'slave_transaction_retry_errors';
......
storage/spider/mysql-test/spider/handler/r/spider3_fixes.result
View file @ bca366e4
...@@ -8,6 +8,7 @@ child3_1 ...@@ -8,6 +8,7 @@ child3_1
child3_2 child3_2
child3_3 child3_3
for slave1_1 for slave1_1
include/start_slave.inc
drop and create databases drop and create databases
connection master_1; connection master_1;
......
storage/spider/mysql-test/spider/handler/r/spider3_fixes_part.result
View file @ bca366e4
...@@ -8,6 +8,7 @@ child3_1 ...@@ -8,6 +8,7 @@ child3_1
child3_2 child3_2
child3_3 child3_3
for slave1_1 for slave1_1
include/start_slave.inc
drop and create databases drop and create databases
connection master_1; connection master_1;
......
storage/spider/mysql-test/spider/handler/r/spider_fixes.result
View file @ bca366e4
...@@ -8,6 +8,7 @@ child3_1 ...@@ -8,6 +8,7 @@ child3_1
child3_2 child3_2
child3_3 child3_3
for slave1_1 for slave1_1
include/start_slave.inc
drop and create databases drop and create databases
connection master_1; connection master_1;
......
storage/spider/mysql-test/spider/handler/r/spider_fixes_part.result
View file @ bca366e4
...@@ -8,6 +8,7 @@ child3_1 ...@@ -8,6 +8,7 @@ child3_1
child3_2 child3_2
child3_3 child3_3
for slave1_1 for slave1_1
include/start_slave.inc
drop and create databases drop and create databases
connection master_1; connection master_1;
......
storage/spider/mysql-test/spider/handler/t/slave_test_init.inc
View file @ bca366e4
...@@ -19,7 +19,7 @@ if (!$SLAVE1_1_SLAVE_STATUS) ...@@ -19,7 +19,7 @@ if (!$SLAVE1_1_SLAVE_STATUS)
MASTER_PORT = $MASTER_1_MYPORT MASTER_PORT = $MASTER_1_MYPORT
; ;
} }
START SLAVE; --source include/start_slave.inc
--connection master_1 --connection master_1
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
--connection slave1_1 --connection slave1_1
......
storage/spider/mysql-test/spider/r/slave_trx_isolation.result
View file @ bca366e4
...@@ -8,6 +8,7 @@ child3_1 ...@@ -8,6 +8,7 @@ child3_1
child3_2 child3_2
child3_3 child3_3
for slave1_1 for slave1_1
include/start_slave.inc
connection slave1_1; connection slave1_1;
set @old_spider_slave_trx_isolation= @@spider_slave_trx_isolation; set @old_spider_slave_trx_isolation= @@spider_slave_trx_isolation;
set global spider_slave_trx_isolation= 1; set global spider_slave_trx_isolation= 1;
......
storage/spider/mysql-test/spider/r/spider3_fixes.result
View file @ bca366e4
...@@ -8,6 +8,7 @@ child3_1 ...@@ -8,6 +8,7 @@ child3_1
child3_2 child3_2
child3_3 child3_3
for slave1_1 for slave1_1
include/start_slave.inc
drop and create databases drop and create databases
connection master_1; connection master_1;
......
storage/spider/mysql-test/spider/r/spider3_fixes_part.result
View file @ bca366e4
...@@ -8,6 +8,7 @@ child3_1 ...@@ -8,6 +8,7 @@ child3_1
child3_2 child3_2
child3_3 child3_3
for slave1_1 for slave1_1
include/start_slave.inc
drop and create databases drop and create databases
connection master_1; connection master_1;
......
storage/spider/mysql-test/spider/r/spider_fixes.result
View file @ bca366e4
...@@ -8,6 +8,7 @@ child3_1 ...@@ -8,6 +8,7 @@ child3_1
child3_2 child3_2
child3_3 child3_3
for slave1_1 for slave1_1
include/start_slave.inc
drop and create databases drop and create databases
connection master_1; connection master_1;
......
storage/spider/mysql-test/spider/r/spider_fixes_part.result
View file @ bca366e4
...@@ -8,6 +8,7 @@ child3_1 ...@@ -8,6 +8,7 @@ child3_1
child3_2 child3_2
child3_3 child3_3
for slave1_1 for slave1_1
include/start_slave.inc
drop and create databases drop and create databases
connection master_1; connection master_1;
......
storage/spider/mysql-test/spider/t/slave_test_init.inc
View file @ bca366e4
...@@ -19,7 +19,7 @@ if (!$SLAVE1_1_SLAVE_STATUS) ...@@ -19,7 +19,7 @@ if (!$SLAVE1_1_SLAVE_STATUS)
MASTER_PORT = $MASTER_1_MYPORT MASTER_PORT = $MASTER_1_MYPORT
; ;
} }
START SLAVE; --source include/start_slave.inc
--connection master_1 --connection master_1
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
--connection slave1_1 --connection slave1_1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7