Skip to content

Commit

Permalink
Bug#25166686::REMOVE ALL THE REDUNDANT .INC FILES FROM MTR
Browse files Browse the repository at this point in the history
Description:
It is noticed that there are a lot of redundant inc files which
are not being used by any of the MTR tests. Also, there are several
inc files which are included in the test but are not needed
anymore.

Fix:

Below inc files are not being used by any test and hence removed:

1.  include/check_key_reads.inc
2.  include/check_key_req.inc
3.  include/commandline_option_test.inc
4.  include/config_file_option_test.inc
5.  include/explain.inc
6.  include/finish_option_test.inc
7.  include/have_binlog_checksum_off.inc
8.  include/have_dynamic_loading.inc
9.  include/have_shm.inc
10. include/init_option_test.inc
11. include/not_blackhole.inc
12. include/show_partition_checksums.inc
13. include/show_partition_contents.inc
14. include/test_outfile.inc

Below are a few inc files which are used in MTR tests but are no more needed.
Hence these inc files along with their references from all MTR tests have been
removed.

1. have_symlink.inc
2. have_perfschema.inc
3. have_innodb.inc

Note: include/not_valgrind_server.inc is not being used by any MTR test but
still not removed as this was introduced as part of Bug#22447330

Reviewed by:
Parveez Baig <parveez.baig@oracle.com>
Deepa Dixit <deepa.dixit@oracle.com>
  • Loading branch information
Mohit Joshi committed Jan 17, 2017
1 parent 74200c0 commit 485545b
Show file tree
Hide file tree
Showing 2,071 changed files with 38 additions and 2,847 deletions.
1 change: 0 additions & 1 deletion mysql-test/extra/binlog_tests/binlog.test
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

-- source include/have_log_bin.inc
-- source include/not_embedded.inc
-- source include/have_innodb.inc
-- source include/have_debug.inc

RESET MASTER;
Expand Down
1 change: 0 additions & 1 deletion mysql-test/extra/binlog_tests/binlog_cache_stat.test
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# Embedded server doesn't support binlog
-- source include/not_embedded.inc
-- source include/have_innodb.inc

# Creating tables
--disable_warnings
Expand Down
1 change: 0 additions & 1 deletion mysql-test/extra/binlog_tests/binlog_xa_prepared.test
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
# has completed a necessary part of its cleanup.
# Selecting from P_S.threads provides a method to learn that.
#
--source include/have_perfschema.inc
--source include/gtid_utils.inc

# Total number of connection each performing one insert into table
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@
--source include/have_debug_sync.inc

--source include/have_myisam.inc
--source include/have_innodb.inc
--let $rpl_gtid_utils= 1
--let $rpl_server_count= 1
--let $rpl_topology= none
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
# Exec_Master_Log_Pos advances as expected.

-- source include/have_log_bin.inc
-- source include/have_innodb.inc
-- source include/have_myisam.inc


Expand Down
1 change: 0 additions & 1 deletion mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.inc
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
--source include/have_innodb.inc
--disable_abort_on_error
--source include/have_myisam.inc

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
# thread again to fully retrieve the partially received transaction.
#

--source include/have_gtid.inc

# As this test depends on the use of a User_var_log_event in a DML statement
# we have to use statement based replication.
--source include/have_binlog_format_statement.inc
Expand Down
1 change: 0 additions & 1 deletion mysql-test/extra/rpl_tests/rpl_loaddata.test
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

-- source include/have_binlog_format_statement.inc
-- source include/master-slave.inc
source include/have_innodb.inc;
source include/have_myisam.inc;

--disable_query_log
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
--source include/begin_include_file.inc

--source include/not_embedded.inc
--source include/have_log_bin.inc
--source include/have_binlog_format_mixed.inc
--source include/not_group_replication_plugin.inc
--source include/have_replication_observers_example_plugin.inc
Expand Down
1 change: 0 additions & 1 deletion mysql-test/extra/rpl_tests/rpl_rollback_to_savepoint.inc
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
# should follow with other DMLs. Ensure that data is replicated properly.
###############################################################################
--source include/not_group_replication_plugin.inc
--source include/have_innodb.inc
--source include/master-slave.inc

--echo #Test case 1:
Expand Down
1 change: 0 additions & 1 deletion mysql-test/extra/rpl_tests/rpl_row_001.test
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
--source include/not_gtid_enabled.inc

# Store the time of password_last_changed column from mysql.user table
# to restore it back later.
Expand Down
1 change: 0 additions & 1 deletion mysql-test/extra/rpl_tests/rpl_sp.test
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

source include/have_binlog_format_mixed.inc;
source include/master-slave.inc;
source include/not_gtid_enabled.inc;


# we need a db != test, where we don't have automatic grants
Expand Down
6 changes: 0 additions & 6 deletions mysql-test/include/check_key_reads.inc

This file was deleted.

9 changes: 0 additions & 9 deletions mysql-test/include/check_key_req.inc

This file was deleted.

22 changes: 0 additions & 22 deletions mysql-test/include/commandline_option_test.inc

This file was deleted.

22 changes: 0 additions & 22 deletions mysql-test/include/config_file_option_test.inc

This file was deleted.

Loading

0 comments on commit 485545b

Please sign in to comment.