Commit 1963a87b authored by Angelique's avatar Angelique

MDEV-30221: Move environmental macros to before master-slave

The fix was introduced, along with re-ordering to do other macros that check test environment capabilities before master/slave is set up.
parent 85cc8318
...@@ -17,10 +17,6 @@ ...@@ -17,10 +17,6 @@
# BUG#12133 master.index file keeps mysqld from starting if bin log has been moved # BUG#12133 master.index file keeps mysqld from starting if bin log has been moved
# BUG#42576 Relay logs in relay-log.info&localhost-relay-bin.index not processed after move # BUG#42576 Relay logs in relay-log.info&localhost-relay-bin.index not processed after move
source include/master-slave.inc;
# There is no need to run this test case on all binlog format
source include/have_binlog_format_row.inc;
# Since this test relies heavily on filesystem operations (like # Since this test relies heavily on filesystem operations (like
# moving files around, backslashes and so forth) we avoid messing # moving files around, backslashes and so forth) we avoid messing
# around with windows access violations for not cluttering the # around with windows access violations for not cluttering the
...@@ -28,6 +24,10 @@ source include/have_binlog_format_row.inc; ...@@ -28,6 +24,10 @@ source include/have_binlog_format_row.inc;
# it is not 100% compliant. # it is not 100% compliant.
--source include/not_windows.inc --source include/not_windows.inc
source include/master-slave.inc;
# There is no need to run this test case on all binlog format
source include/have_binlog_format_row.inc;
connection master; connection master;
--let $master_datadir= `select @@datadir` --let $master_datadir= `select @@datadir`
connection slave; connection slave;
......
--source include/no_valgrind_without_big.inc
--let $rpl_topology=1->2 --let $rpl_topology=1->2
--source include/rpl_init.inc --source include/rpl_init.inc
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/no_valgrind_without_big.inc
--echo *** Test normal shutdown/restart of slave server configured as a GTID slave. *** --echo *** Test normal shutdown/restart of slave server configured as a GTID slave. ***
......
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
# #
# (iii) master and slave tables do not differ # (iii) master and slave tables do not differ
# #
-- source include/master-slave.inc
-- source include/not_windows.inc -- source include/not_windows.inc
-- source include/master-slave.inc
SET SQL_LOG_BIN=0; SET SQL_LOG_BIN=0;
CREATE DATABASE B37656; CREATE DATABASE B37656;
......
--source include/no_valgrind_without_big.inc
--source include/have_innodb.inc --source include/have_innodb.inc
--let $rpl_topology=1->2 --let $rpl_topology=1->2
--source include/rpl_init.inc --source include/rpl_init.inc
--source include/no_valgrind_without_big.inc
--connection server_2 --connection server_2
call mtr.add_suppression("The automatically created table.*name may not be entirely in lowercase"); call mtr.add_suppression("The automatically created table.*name may not be entirely in lowercase");
......
--source include/not_windows.inc #unix shell escaping used for mysqlbinlog
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/have_binlog_format_statement.inc --source include/have_binlog_format_statement.inc
--source include/master-slave.inc --source include/master-slave.inc
--source include/not_windows.inc #unix shell escaping used for mysqlbinlog
# MDEV-382: multiple SQL injections in replication code. # MDEV-382: multiple SQL injections in replication code.
......
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
# For details look into extra/rpl_tests/rpl_lower_case_table_names.test # For details look into extra/rpl_tests/rpl_lower_case_table_names.test
# #
-- source include/master-slave.inc
-- source include/have_innodb.inc
-- source include/not_windows.inc -- source include/not_windows.inc
-- source include/have_innodb.inc
-- source include/have_binlog_format_row.inc -- source include/have_binlog_format_row.inc
-- source include/master-slave.inc
-- let $engine=InnoDB -- let $engine=InnoDB
-- source include/rpl_lower_case_table_names.test -- source include/rpl_lower_case_table_names.test
source include/no_valgrind_without_big.inc;
source include/not_embedded.inc; source include/not_embedded.inc;
source include/have_innodb.inc; source include/have_innodb.inc;
source include/master-slave.inc; source include/master-slave.inc;
source include/no_valgrind_without_big.inc;
let $engine_type= InnoDB; let $engine_type= InnoDB;
......
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
# Please check all dependent tests after modifying it # Please check all dependent tests after modifying it
# #
source include/no_valgrind_without_big.inc;
source include/have_ssl_communication.inc; source include/have_ssl_communication.inc;
source include/master-slave.inc; source include/master-slave.inc;
source include/no_valgrind_without_big.inc;
# create a user for replication that requires ssl encryption # create a user for replication that requires ssl encryption
connection master; connection master;
......
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
# For details look into extra/rpl_tests/rpl_lower_case_table_names.test # For details look into extra/rpl_tests/rpl_lower_case_table_names.test
# #
-- source include/not_windows.inc
-- source include/have_innodb.inc
-- source include/have_binlog_format_mixed_or_statement.inc -- source include/have_binlog_format_mixed_or_statement.inc
-- source include/master-slave.inc -- source include/master-slave.inc
-- source include/have_innodb.inc
-- source include/not_windows.inc
-- let $engine=InnoDB -- let $engine=InnoDB
-- source include/rpl_lower_case_table_names.test -- source include/rpl_lower_case_table_names.test
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