database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

remove few obscure, unused, or misused mtr features

Browse Source
This commit is contained in:
Sergei Golubchik
2012-02-06 18:42:18 +01:00
parent 6f0101186d
commit 2bcb4184ef
59 changed files with 1114 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,4 +45,3 @@ delete from mysql.user where user="replicate";
# End of 4.1 tests
--source include/rpl_end.inc
--source include/force_restart.inc

1
mysql-test/suite/rpl/t/rpl_bug33931-master.opt
View File

@ -1 +0,0 @@
--force-restart

1
mysql-test/suite/rpl/t/rpl_cross_version-master.opt
View File

@ -1,2 +1 @@
--replicate-same-server-id --relay-log=slave-relay-bin
--force-restart

1
mysql-test/suite/rpl/t/rpl_current_user-master.opt
View File

@ -1 +0,0 @@
--force-restart

1
mysql-test/suite/rpl/t/rpl_dual_pos_advance-master.opt
View File

@ -1 +0,0 @@
--force-restart

1
mysql-test/suite/rpl/t/rpl_heartbeat-master.opt
View File

@ -1 +0,0 @@
--force-restart

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

@ -17,7 +17,9 @@ reset master;
connection slave;
set @restore_slave_net_timeout= @@global.slave_net_timeout;
--disable_warnings
set @@global.slave_net_timeout= 10;
--enable_warnings
###
### Checking the range

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

@ -183,4 +183,3 @@ DROP TABLE t5;
sync_slave_with_master;
--source include/rpl_end.inc
--source include/force_restart.inc

1
mysql-test/suite/rpl/t/rpl_ip_mix-master.opt
View File

@ -1 +0,0 @@
--force-restart

1
mysql-test/suite/rpl/t/rpl_ip_mix2-master.opt
View File

@ -1 +0,0 @@
--force-restart

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

@ -10,8 +10,8 @@
##########
# Includes
-- source include/master-slave.inc
-- source include/have_binlog_format_mixed_or_row.inc
-- source include/master-slave.inc
-- source extra/rpl_tests/rpl_loadfile.test

3
mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test
View File

@ -9,12 +9,13 @@
-- source include/have_binlog_format_row.inc
# Embedded server doesn't support binlogging
-- source include/not_embedded.inc
-- source include/master-slave.inc
# This test requires the cp932 charset compiled in
-- source include/have_cp932.inc
# Slow test, don't run during staging part
-- source include/not_staging.inc
-- source include/master-slave.inc
# Setup Section
# we need this for getting fixed timestamps inside of this test

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

@ -3,9 +3,9 @@
# The test verifies that SHOW STATUS LIKE 'Slave_running' displays ON
# if and only if `SHOW SLAVE STATUS' displays YES for Slave_IO_Running and Slave_SQL_Running
#
source include/master-slave.inc;
source include/have_debug.inc;
source include/have_debug_sync.inc;
source include/master-slave.inc;
connection slave;

1
mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist-master.opt
View File

@ -1 +0,0 @@
--force-restart

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

@ -75,4 +75,3 @@ connection master;
DROP TABLE t1;
--source include/rpl_end.inc
--source include/force_restart.inc

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

@ -1 +1 @@
--force-restart --log-slow-slave-statements --log-slow-queries
--log-slow-slave-statements --log-slow-queries

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

@ -1,9 +1,9 @@
# File for specialities regarding replication from or to InnoDB
# tables.
source include/master-slave.inc;
source include/have_innodb.inc;
source include/have_binlog_format_mixed_or_statement.inc;
source include/master-slave.inc;
source extra/rpl_tests/rpl_innodb.test;
--source include/rpl_end.inc

1
mysql-test/suite/rpl/t/rpl_stm_log-master.opt
View File

@ -1 +0,0 @@
--force-restart

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

@ -12,8 +12,8 @@
# This test issues SHOW [BINLOG|RELAYLOG] EVENTS both on master and slave after
# some statements have been issued.
-- source include/master-slave.inc
-- source include/have_binlog_format_mixed_or_statement.inc
-- source include/master-slave.inc
-- source extra/rpl_tests/rpl_show_relaylog_events.inc
--source include/rpl_end.inc

1
mysql-test/suite/rpl/t/rpl_stm_until-master.opt
View File

@ -1 +0,0 @@
--force-restart

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

@ -10,6 +10,7 @@
-- source include/not_ndb_default.inc
-- source include/have_binlog_format_mixed_or_row.inc
-- source include/master-slave.inc
# Since this test generates row-based events in the binary log, the
@ -18,7 +19,6 @@
# BINLOG_FORMAT.
connection slave;
-- source include/have_binlog_format_mixed_or_row.inc
connection master;
--disable_warnings

1
mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt
View File

@ -1,2 +1 @@
--loose-debug-dbug="+d,all_errors_are_temporary_errors" --slave-transaction-retries=2
--force-restart

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

@ -1 +0,0 @@
--testcase-timeout=40

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

@ -60,8 +60,8 @@
# actually can be replicated safely in statement mode.
source include/master-slave.inc;
source include/have_binlog_format_mixed_or_row.inc;
source include/master-slave.inc;
--echo ==== Initialization ====