Move mysql-test-run/extra/rpl_tests to suite/rpl/include

Renamed suite/rpl/include/rpl_sync.inc to rpl_sync_test.inc to remove clash with include/rpl_sync.inc
MariaDB · Mar 29, 2018 · 39018f2 · 39018f2
1 parent 108ed22
commit 39018f2
Show file tree

Hide file tree

Showing 290 changed files with 891 additions and 890 deletions.
diff --git a/mysql-test/extra/rpl_tests/rpl_show_log_events_with_varying_options.inc b/mysql-test/extra/rpl_tests/rpl_show_log_events_with_varying_options.inc
diff --git a/mysql-test/include/rpl_row_img_general_loop.inc b/mysql-test/include/rpl_row_img_general_loop.inc
@@ -12,7 +12,7 @@
 #    the name of the test script to include in every combination
 #
 # Sample usage:
-#   -- let $row_img_test_script= extra/rpl_tests/rpl_row_img.test
+#   -- let $row_img_test_script= suite/rpl/include/rpl_row_img.test
 #   -- source include/rpl_row_img_general_loop.test
 
 

diff --git a/mysql-test/include/show_delayed_slave_state.inc b/mysql-test/include/show_delayed_slave_state.inc
@@ -5,7 +5,7 @@
 # ==== Usage ====
 #
 # --let $verbose_delayed_slave_state= [0|1]
-# --source extra/rpl_tests/show_delayed_slave_state.inc
+# --source suite/rpl/include/show_delayed_slave_state.inc
 #
 # By default, the output is normalized so that it does not depend on
 # exact timing or exact binlog positions. If

diff --git a/mysql-test/suite/binlog/t/binlog_unsafe.test b/mysql-test/suite/binlog/t/binlog_unsafe.test
@@ -261,7 +261,7 @@ while ($unsafe_type < 9) {
     --let $CRC_ARG_sel_sidef= $sel_sidef_0
     --let $CRC_ARG_sel_retval= $sel_retval_0
     --let $CRC_ARG_desc= $desc_0
-    --source extra/rpl_tests/create_recursive_construct.inc
+    --source suite/rpl/include/create_recursive_construct.inc
     --let $stmt_sidef_1= $CRC_RET_stmt_sidef
     --let $value_1= $CRC_RET_value
     --let $sel_sidef_1= $CRC_RET_sel_sidef
@@ -292,7 +292,7 @@ while ($unsafe_type < 9) {
         --let $CRC_ARG_sel_sidef= $sel_sidef_1
         --let $CRC_ARG_sel_retval= $sel_retval_1
         --let $CRC_ARG_desc= $desc_1
-        --source extra/rpl_tests/create_recursive_construct.inc
+        --source suite/rpl/include/create_recursive_construct.inc
         --let $stmt_sidef_2= $CRC_RET_stmt_sidef
         --let $value_2= $CRC_RET_value
         --let $sel_sidef_2= $CRC_RET_sel_sidef
@@ -321,7 +321,7 @@ while ($unsafe_type < 9) {
             --let $CRC_ARG_sel_sidef= $sel_sidef_2
             --let $CRC_ARG_sel_retval= $sel_retval_2
             --let $CRC_ARG_desc= $desc_2
-            --source extra/rpl_tests/create_recursive_construct.inc
+            --source suite/rpl/include/create_recursive_construct.inc
 
             # Drop created object.
             if ($drop_3) {

diff --git a/mysql-test/suite/binlog_encryption/multisource.test b/mysql-test/suite/binlog_encryption/multisource.test
@@ -1 +1 @@
---source extra/rpl_tests/multisource.inc
+--source suite/rpl/include/multisource.inc
diff --git a/mysql-test/suite/binlog_encryption/rpl_binlog_errors.test b/mysql-test/suite/binlog_encryption/rpl_binlog_errors.test
@@ -1,2 +1,2 @@
 --let $binlog_limit= 5,1
---source extra/rpl_tests/rpl_binlog_errors.inc
+--source suite/rpl/include/rpl_binlog_errors.inc
diff --git a/mysql-test/suite/binlog_encryption/rpl_cant_read_event_incident.test b/mysql-test/suite/binlog_encryption/rpl_cant_read_event_incident.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_cant_read_event_incident.inc
+--source suite/rpl/include/rpl_cant_read_event_incident.inc
diff --git a/mysql-test/suite/binlog_encryption/rpl_checksum.test b/mysql-test/suite/binlog_encryption/rpl_checksum.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_checksum.inc
+--source suite/rpl/include/rpl_checksum.inc
diff --git a/mysql-test/suite/binlog_encryption/rpl_checksum_cache.test b/mysql-test/suite/binlog_encryption/rpl_checksum_cache.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_checksum_cache.inc
+--source suite/rpl/include/rpl_checksum_cache.inc
diff --git a/mysql-test/suite/binlog_encryption/rpl_corruption.test b/mysql-test/suite/binlog_encryption/rpl_corruption.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_corruption.inc
+--source suite/rpl/include/rpl_corruption.inc
diff --git a/mysql-test/suite/binlog_encryption/rpl_gtid_basic.test b/mysql-test/suite/binlog_encryption/rpl_gtid_basic.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_gtid_basic.inc
+--source suite/rpl/include/rpl_gtid_basic.inc
diff --git a/mysql-test/suite/binlog_encryption/rpl_incident.test b/mysql-test/suite/binlog_encryption/rpl_incident.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_incident.inc
+--source suite/rpl/include/rpl_incident.inc
diff --git a/mysql-test/suite/binlog_encryption/rpl_init_slave_errors.test b/mysql-test/suite/binlog_encryption/rpl_init_slave_errors.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_init_slave_errors.inc
+--source suite/rpl/include/rpl_init_slave_errors.inc
diff --git a/mysql-test/suite/binlog_encryption/rpl_loaddata_local.test b/mysql-test/suite/binlog_encryption/rpl_loaddata_local.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_loaddata_local.inc
+--source suite/rpl/include/rpl_loaddata_local.inc
diff --git a/mysql-test/suite/binlog_encryption/rpl_loadfile.test b/mysql-test/suite/binlog_encryption/rpl_loadfile.test
@@ -1,4 +1,4 @@
---source extra/rpl_tests/rpl_loadfile.inc
+--source suite/rpl/include/rpl_loadfile.inc
 
 --let $datadir= `SELECT @@datadir`
 

diff --git a/mysql-test/suite/binlog_encryption/rpl_mixed_binlog_max_cache_size.test b/mysql-test/suite/binlog_encryption/rpl_mixed_binlog_max_cache_size.test
@@ -3,5 +3,5 @@
 --source include/not_windows.inc
 --source include/have_binlog_format_mixed.inc
 
---source extra/rpl_tests/rpl_binlog_max_cache_size.test
+--source suite/rpl/include/rpl_binlog_max_cache_size.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/binlog_encryption/rpl_packet.test b/mysql-test/suite/binlog_encryption/rpl_packet.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_packet.inc
+--source suite/rpl/include/rpl_packet.inc
diff --git a/mysql-test/suite/binlog_encryption/rpl_parallel.test b/mysql-test/suite/binlog_encryption/rpl_parallel.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_parallel.inc
+--source suite/rpl/include/rpl_parallel.inc
diff --git a/mysql-test/suite/binlog_encryption/rpl_parallel_show_binlog_events_purge_logs.test b/mysql-test/suite/binlog_encryption/rpl_parallel_show_binlog_events_purge_logs.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_parallel_show_binlog_events_purge_logs.inc
+--source suite/rpl/include/rpl_parallel_show_binlog_events_purge_logs.inc
diff --git a/mysql-test/suite/binlog_encryption/rpl_relayrotate.test b/mysql-test/suite/binlog_encryption/rpl_relayrotate.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_relayrotate.inc
+--source suite/rpl/include/rpl_relayrotate.inc
diff --git a/mysql-test/suite/binlog_encryption/rpl_semi_sync.test b/mysql-test/suite/binlog_encryption/rpl_semi_sync.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_semi_sync.inc
+--source suite/rpl/include/rpl_semi_sync.inc
diff --git a/mysql-test/suite/binlog_encryption/rpl_skip_replication.test b/mysql-test/suite/binlog_encryption/rpl_skip_replication.test
@@ -1,2 +1,2 @@
 --let $use_remote_mysqlbinlog= 1
---source extra/rpl_tests/rpl_skip_replication.inc
+--source suite/rpl/include/rpl_skip_replication.inc
diff --git a/mysql-test/suite/binlog_encryption/rpl_special_charset.test b/mysql-test/suite/binlog_encryption/rpl_special_charset.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_special_charset.inc
+--source suite/rpl/include/rpl_special_charset.inc
diff --git a/mysql-test/suite/binlog_encryption/rpl_sporadic_master.test b/mysql-test/suite/binlog_encryption/rpl_sporadic_master.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_sporadic_master.inc
+--source suite/rpl/include/rpl_sporadic_master.inc
diff --git a/mysql-test/suite/binlog_encryption/rpl_ssl.test b/mysql-test/suite/binlog_encryption/rpl_ssl.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_ssl.inc
+--source suite/rpl/include/rpl_ssl.inc
diff --git a/mysql-test/suite/binlog_encryption/rpl_stm_relay_ign_space.test b/mysql-test/suite/binlog_encryption/rpl_stm_relay_ign_space.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_stm_relay_ign_space.inc
+--source suite/rpl/include/rpl_stm_relay_ign_space.inc
diff --git a/mysql-test/suite/binlog_encryption/rpl_switch_stm_row_mixed.test b/mysql-test/suite/binlog_encryption/rpl_switch_stm_row_mixed.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_switch_stm_row_mixed.inc
+--source suite/rpl/include/rpl_switch_stm_row_mixed.inc
diff --git a/mysql-test/suite/binlog_encryption/rpl_sync.test b/mysql-test/suite/binlog_encryption/rpl_sync.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_sync.inc
+--source suite/rpl/include/rpl_sync_test.inc
diff --git a/mysql-test/suite/binlog_encryption/rpl_temporal_format_default_to_default.test b/mysql-test/suite/binlog_encryption/rpl_temporal_format_default_to_default.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_temporal_format_default_to_default.inc
+--source suite/rpl/include/rpl_temporal_format_default_to_default.inc
diff --git a/mysql-test/suite/binlog_encryption/rpl_temporal_format_mariadb53_to_mysql56.test b/mysql-test/suite/binlog_encryption/rpl_temporal_format_mariadb53_to_mysql56.test
@@ -3,4 +3,4 @@
 --let $force_master_mysql56_temporal_format=false;
 --let $force_slave_mysql56_temporal_format=true;
 
---source extra/rpl_tests/rpl_temporal_format_default_to_default.inc
+--source suite/rpl/include/rpl_temporal_format_default_to_default.inc
diff --git a/mysql-test/suite/binlog_encryption/rpl_temporal_format_mysql56_to_mariadb53.test b/mysql-test/suite/binlog_encryption/rpl_temporal_format_mysql56_to_mariadb53.test
@@ -1,4 +1,4 @@
 --let $force_master_mysql56_temporal_format=true;
 --let $force_slave_mysql56_temporal_format=false;
 
---source extra/rpl_tests/rpl_temporal_format_default_to_default.inc
+--source suite/rpl/include/rpl_temporal_format_default_to_default.inc
diff --git a/mysql-test/suite/binlog_encryption/rpl_typeconv.test b/mysql-test/suite/binlog_encryption/rpl_typeconv.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_typeconv.inc
+--source suite/rpl/include/rpl_typeconv.inc
diff --git a/mysql-test/suite/engines/funcs/t/rpl_row_max_relay_size.test b/mysql-test/suite/engines/funcs/t/rpl_row_max_relay_size.test
@@ -6,4 +6,4 @@
 # Requires statement logging
 source include/have_binlog_format_row.inc;
 
-source extra/rpl_tests/rpl_max_relay_size.test;
+source suite/rpl/include/rpl_max_relay_size.test;
diff --git a/mysql-test/suite/engines/funcs/t/rpl_row_reset_slave.test b/mysql-test/suite/engines/funcs/t/rpl_row_reset_slave.test
@@ -1,5 +1,5 @@
 # TBF - difference in row level logging
 # Temp tables are not replicated in rbr, but it is still good to hit rbr with everthing
 -- source include/have_binlog_format_row.inc
--- source extra/rpl_tests/rpl_reset_slave.test
+-- source suite/rpl/include/rpl_reset_slave.test
 
diff --git a/mysql-test/suite/engines/funcs/t/rpl_stm_max_relay_size.test b/mysql-test/suite/engines/funcs/t/rpl_stm_max_relay_size.test
@@ -5,7 +5,7 @@
 
 # Requires statement logging
 -- source include/have_binlog_format_mixed_or_statement.inc
--- source extra/rpl_tests/rpl_max_relay_size.test
+-- source suite/rpl/include/rpl_max_relay_size.test
 
 # End of 4.1 tests
 # 
diff --git a/mysql-test/suite/engines/funcs/t/rpl_stm_reset_slave.test b/mysql-test/suite/engines/funcs/t/rpl_stm_reset_slave.test
@@ -1,6 +1,6 @@
 # TBF - difference in row level logging
 -- source include/have_binlog_format_mixed_or_statement.inc
--- source extra/rpl_tests/rpl_reset_slave.test
+-- source suite/rpl/include/rpl_reset_slave.test
 
 # End of 4.1 tests
 #
diff --git a/mysql-test/suite/multi_source/multisource.test b/mysql-test/suite/multi_source/multisource.test
@@ -1 +1 @@
---source extra/rpl_tests/multisource.inc
+--source suite/rpl/include/multisource.inc
diff --git a/mysql-test/extra/rpl_tests/check_type.inc → mysql-test/suite/rpl/include/check_type.inc b/mysql-test/extra/rpl_tests/check_type.inc → mysql-test/suite/rpl/include/check_type.inc
diff --git a/.../rpl_tests/create_recursive_construct.inc → ...pl/include/create_recursive_construct.inc b/.../rpl_tests/create_recursive_construct.inc → ...pl/include/create_recursive_construct.inc
@@ -49,7 +49,7 @@
 # let $CRC_ARG_sel_retval= <stmt>;
 # let $CRC_ARG_sel_sidef= <stmt>;
 # let $CRC_ARG_desc= <desc>;
-# source extra/rpl_tests/create_recursive_construct.inc;
+# source suite/rpl/include/create_recursive_construct.inc;
 # let $my_stmt_sidef= $CRC_RET_stmt_sidef;
 # let $my_value= $CRC_RET_value;
 # let $my_sel_sidef= $CRC_RET_sel_sidef;

diff --git a/...rpl_tests/delayed_slave_wait_on_query.inc → ...l/include/delayed_slave_wait_on_query.inc b/...rpl_tests/delayed_slave_wait_on_query.inc → ...l/include/delayed_slave_wait_on_query.inc
@@ -14,7 +14,7 @@
 # ==== Usage ====
 #
 # --let $query_number= 4
-# --source extra/rpl_tests/delayed_slave_wait_on_query.inc
+# --source suite/rpl/include/delayed_slave_wait_on_query.inc
 #
 # Parameters:
 # $query_number

diff --git a/mysql-test/extra/rpl_tests/multisource.inc → mysql-test/suite/rpl/include/multisource.inc b/mysql-test/extra/rpl_tests/multisource.inc → mysql-test/suite/rpl/include/multisource.inc
@@ -4,7 +4,7 @@
 # Please check all dependent tests after modifying it
 #
 # Usage:
-# --source extra/rpl_tests/multisource.inc
+# --source suite/rpl/include/multisource.inc
 #
 # By default, the script expects the length of the 2nd binary log to be
 # $binlog_start_pos + length(Gtid_list event) + 2 x length(Binlog_checkpoint event)

diff --git a/mysql-test/extra/rpl_tests/rpl_EE_err.test → mysql-test/suite/rpl/include/rpl_EE_err.test b/mysql-test/extra/rpl_tests/rpl_EE_err.test → mysql-test/suite/rpl/include/rpl_EE_err.test
diff --git a/...t/extra/rpl_tests/rpl_auto_increment.test → ...suite/rpl/include/rpl_auto_increment.test b/...t/extra/rpl_tests/rpl_auto_increment.test → ...suite/rpl/include/rpl_auto_increment.test
diff --git a/...tests/rpl_auto_increment_insert_view.test → ...clude/rpl_auto_increment_insert_view.test b/...tests/rpl_auto_increment_insert_view.test → ...clude/rpl_auto_increment_insert_view.test
diff --git a/...ts/rpl_auto_increment_invoke_trigger.test → ...de/rpl_auto_increment_invoke_trigger.test b/...ts/rpl_auto_increment_invoke_trigger.test → ...de/rpl_auto_increment_invoke_trigger.test
diff --git a/...sts/rpl_autoinc_func_invokes_trigger.test → ...ude/rpl_autoinc_func_invokes_trigger.test b/...sts/rpl_autoinc_func_invokes_trigger.test → ...ude/rpl_autoinc_func_invokes_trigger.test
diff --git a/...est/extra/rpl_tests/rpl_binlog_errors.inc → ...t/suite/rpl/include/rpl_binlog_errors.inc b/...est/extra/rpl_tests/rpl_binlog_errors.inc → ...t/suite/rpl/include/rpl_binlog_errors.inc
diff --git a/.../rpl_tests/rpl_binlog_max_cache_size.test → ...pl/include/rpl_binlog_max_cache_size.test b/.../rpl_tests/rpl_binlog_max_cache_size.test → ...pl/include/rpl_binlog_max_cache_size.test
diff --git a/...l-test/extra/rpl_tests/rpl_blackhole.test → ...test/suite/rpl/include/rpl_blackhole.test b/...l-test/extra/rpl_tests/rpl_blackhole.test → ...test/suite/rpl/include/rpl_blackhole.test
diff --git a/...pl_tests/rpl_cant_read_event_incident.inc → .../include/rpl_cant_read_event_incident.inc b/...pl_tests/rpl_cant_read_event_incident.inc → .../include/rpl_cant_read_event_incident.inc
diff --git a/mysql-test/extra/rpl_tests/rpl_charset.test → ...l-test/suite/rpl/include/rpl_charset.test b/mysql-test/extra/rpl_tests/rpl_charset.test → ...l-test/suite/rpl/include/rpl_charset.test
diff --git a/mysql-test/extra/rpl_tests/rpl_checksum.inc → ...l-test/suite/rpl/include/rpl_checksum.inc b/mysql-test/extra/rpl_tests/rpl_checksum.inc → ...l-test/suite/rpl/include/rpl_checksum.inc
diff --git a/...st/extra/rpl_tests/rpl_checksum_cache.inc → .../suite/rpl/include/rpl_checksum_cache.inc b/...st/extra/rpl_tests/rpl_checksum_cache.inc → .../suite/rpl/include/rpl_checksum_cache.inc
diff --git a/...tra/rpl_tests/rpl_commit_after_flush.test → ...e/rpl/include/rpl_commit_after_flush.test b/...tra/rpl_tests/rpl_commit_after_flush.test → ...e/rpl/include/rpl_commit_after_flush.test
diff --git a/...l-test/extra/rpl_tests/rpl_conflicts.test → ...test/suite/rpl/include/rpl_conflicts.test b/...l-test/extra/rpl_tests/rpl_conflicts.test → ...test/suite/rpl/include/rpl_conflicts.test
diff --git a/...l-test/extra/rpl_tests/rpl_corruption.inc → ...test/suite/rpl/include/rpl_corruption.inc b/...l-test/extra/rpl_tests/rpl_corruption.inc → ...test/suite/rpl/include/rpl_corruption.inc
diff --git a/mysql-test/extra/rpl_tests/rpl_ddl.test → mysql-test/suite/rpl/include/rpl_ddl.test b/mysql-test/extra/rpl_tests/rpl_ddl.test → mysql-test/suite/rpl/include/rpl_ddl.test
@@ -1,4 +1,4 @@
-################# extra/rpl_tests/rpl_ddl.test ########################
+################# suite/rpl/include/rpl_ddl.test ########################
 #                                                                     #
 # DDL statements (sometimes with implicit COMMIT) and other stuff     #
 # executed on the master and it's propagation into the slave.         #

diff --git a/mysql-test/extra/rpl_tests/rpl_deadlock.test → ...-test/suite/rpl/include/rpl_deadlock.test b/mysql-test/extra/rpl_tests/rpl_deadlock.test → ...-test/suite/rpl/include/rpl_deadlock.test
diff --git a/.../extra/rpl_tests/rpl_delete_no_where.test → ...uite/rpl/include/rpl_delete_no_where.test b/.../extra/rpl_tests/rpl_delete_no_where.test → ...uite/rpl/include/rpl_delete_no_where.test
diff --git a/.../rpl_tests/rpl_drop_create_temp_table.inc → ...pl/include/rpl_drop_create_temp_table.inc b/.../rpl_tests/rpl_drop_create_temp_table.inc → ...pl/include/rpl_drop_create_temp_table.inc