diff options
290 files changed, 891 insertions, 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 deleted file mode 100644 index 988ffcc1bc1..00000000000 --- a/mysql-test/extra/rpl_tests/rpl_show_log_events_with_varying_options.inc +++ /dev/null @@ -1,11 +0,0 @@ -# Include file for rpl_show_log_events.inc - ---let $binlog_limit= ---source extra/rpl_tests/rpl_show_binlog_events.inc ---let $binlog_limit= 2 ---source extra/rpl_tests/rpl_show_binlog_events.inc ---let $binlog_limit= 2,4 ---source extra/rpl_tests/rpl_show_binlog_events.inc ---let $binlog_limit= ---let $binlog_file= ---source extra/rpl_tests/rpl_show_binlog_events.inc diff --git a/mysql-test/include/rpl_row_img_general_loop.inc b/mysql-test/include/rpl_row_img_general_loop.inc index 3c7749e5135..1e3e42f893c 100644 --- 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 index 8eb7232a206..53a9aa828de 100644 --- 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 index a23155e6c1d..673712ff209 100644 --- 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 index fc58fe81803..53d9f40877f 100644 --- 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 index a4611f515c4..c2a7ec9d27a 100644 --- 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 index 6d222cba115..acbe0d59a5e 100644 --- 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 index 8e006b1b6a0..ca8cdc06726 100644 --- 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 index 56c3e1e1cb5..8fa44136fc2 100644 --- 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 index 310b0cef8e8..1abf2c882ec 100644 --- 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 index 70be6fbff1f..b9f5a18a588 100644 --- 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 index 9be855e1a8b..b6d2a24a71e 100644 --- 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 index 6f515b9390a..872b8cd3598 100644 --- 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 index 8d90afaed27..9e0bb9598bf 100644 --- 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 index 40379a5c3d0..84e6ecd7a0d 100644 --- 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 index 8fb7350b815..144f86cceba 100644 --- 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 index 31357cb148e..43637314236 100644 --- 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 index b7c4bb429a4..dba54e4fd7a 100644 --- 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 index 9e93b0b56e9..7bdfaaf9adb 100644 --- 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 index 5e3bcdcd711..e52f5159fcc 100644 --- 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 index d5f80619aeb..dfc68b699c0 100644 --- 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 index e7b52f2fadb..40992586c7c 100644 --- 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 index 6f196005711..eb697204860 100644 --- 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 index 0a756982047..0dab68a4b08 100644 --- 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 index 883b367e9f2..9a4788c1d2d 100644 --- 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 index f72300ee2de..45d18a25410 100644 --- 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 index cd826c6be1e..2a16d90f9ad 100644 --- 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 index 189dd8220ef..8dbd6ff254b 100644 --- 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 index 99a70e011c4..30f5f247c23 100644 --- 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 index 1df4a48f0a9..68afb4148ef 100644 --- 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 index f7436ed6fef..96d928fcf08 100644 --- 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 index 4dbfc27d088..fe56a148256 100644 --- 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 index 3e057d48ec9..6df58122051 100644 --- 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 index a970c161153..5c2ba774543 100644 --- 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 index 950aa8b322a..da1921ec262 100644 --- 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 index 6a99d4e1613..63ff768b4f3 100644 --- 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 index fc58fe81803..53d9f40877f 100644 --- 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 b/mysql-test/suite/rpl/include/check_type.inc index 97300753d38..97300753d38 100644 --- a/mysql-test/extra/rpl_tests/check_type.inc +++ b/mysql-test/suite/rpl/include/check_type.inc diff --git a/mysql-test/extra/rpl_tests/create_recursive_construct.inc b/mysql-test/suite/rpl/include/create_recursive_construct.inc index b7405aa4c7f..815bbb4973e 100644 --- a/mysql-test/extra/rpl_tests/create_recursive_construct.inc +++ b/mysql-test/suite/rpl/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/mysql-test/extra/rpl_tests/delayed_slave_wait_on_query.inc b/mysql-test/suite/rpl/include/delayed_slave_wait_on_query.inc index ffdcb7f60bb..0aa4c05b75a 100644 --- a/mysql-test/extra/rpl_tests/delayed_slave_wait_on_query.inc +++ b/mysql-test/suite/rpl/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 b/mysql-test/suite/rpl/include/multisource.inc index adaae775f48..bbdf373f794 100644 --- a/mysql-test/extra/rpl_tests/multisource.inc +++ b/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 b/mysql-test/suite/rpl/include/rpl_EE_err.test index 0b3fec1f605..0b3fec1f605 100644 --- a/mysql-test/extra/rpl_tests/rpl_EE_err.test +++ b/mysql-test/suite/rpl/include/rpl_EE_err.test diff --git a/mysql-test/extra/rpl_tests/rpl_auto_increment.test b/mysql-test/suite/rpl/include/rpl_auto_increment.test index 67286c37258..67286c37258 100644 --- a/mysql-test/extra/rpl_tests/rpl_auto_increment.test +++ b/mysql-test/suite/rpl/include/rpl_auto_increment.test diff --git a/mysql-test/extra/rpl_tests/rpl_auto_increment_insert_view.test b/mysql-test/suite/rpl/include/rpl_auto_increment_insert_view.test index 30b25955ecb..30b25955ecb 100644 --- a/mysql-test/extra/rpl_tests/rpl_auto_increment_insert_view.test +++ b/mysql-test/suite/rpl/include/rpl_auto_increment_insert_view.test diff --git a/mysql-test/extra/rpl_tests/rpl_auto_increment_invoke_trigger.test b/mysql-test/suite/rpl/include/rpl_auto_increment_invoke_trigger.test index f93d435349f..f93d435349f 100644 --- a/mysql-test/extra/rpl_tests/rpl_auto_increment_invoke_trigger.test +++ b/mysql-test/suite/rpl/include/rpl_auto_increment_invoke_trigger.test diff --git a/mysql-test/extra/rpl_tests/rpl_autoinc_func_invokes_trigger.test b/mysql-test/suite/rpl/include/rpl_autoinc_func_invokes_trigger.test index d7c26ea42f1..d7c26ea42f1 100644 --- a/mysql-test/extra/rpl_tests/rpl_autoinc_func_invokes_trigger.test +++ b/mysql-test/suite/rpl/include/rpl_autoinc_func_invokes_trigger.test diff --git a/mysql-test/extra/rpl_tests/rpl_binlog_errors.inc b/mysql-test/suite/rpl/include/rpl_binlog_errors.inc index 46c76f2b04c..46c76f2b04c 100644 --- a/mysql-test/extra/rpl_tests/rpl_binlog_errors.inc +++ b/mysql-test/suite/rpl/include/rpl_binlog_errors.inc diff --git a/mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test b/mysql-test/suite/rpl/include/rpl_binlog_max_cache_size.test index 0f46b00f683..0f46b00f683 100644 --- a/mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test +++ b/mysql-test/suite/rpl/include/rpl_binlog_max_cache_size.test diff --git a/mysql-test/extra/rpl_tests/rpl_blackhole.test b/mysql-test/suite/rpl/include/rpl_blackhole.test index a37d24b4cd6..a37d24b4cd6 100644 --- a/mysql-test/extra/rpl_tests/rpl_blackhole.test +++ b/mysql-test/suite/rpl/include/rpl_blackhole.test diff --git a/mysql-test/extra/rpl_tests/rpl_cant_read_event_incident.inc b/mysql-test/suite/rpl/include/rpl_cant_read_event_incident.inc index 7dfef023947..7dfef023947 100644 --- a/mysql-test/extra/rpl_tests/rpl_cant_read_event_incident.inc +++ b/mysql-test/suite/rpl/include/rpl_cant_read_event_incident.inc diff --git a/mysql-test/extra/rpl_tests/rpl_charset.test b/mysql-test/suite/rpl/include/rpl_charset.test index e67122cbb4c..e67122cbb4c 100644 --- a/mysql-test/extra/rpl_tests/rpl_charset.test +++ b/mysql-test/suite/rpl/include/rpl_charset.test diff --git a/mysql-test/extra/rpl_tests/rpl_checksum.inc b/mysql-test/suite/rpl/include/rpl_checksum.inc index b5e70abe4d0..b5e70abe4d0 100644 --- a/mysql-test/extra/rpl_tests/rpl_checksum.inc +++ b/mysql-test/suite/rpl/include/rpl_checksum.inc diff --git a/mysql-test/extra/rpl_tests/rpl_checksum_cache.inc b/mysql-test/suite/rpl/include/rpl_checksum_cache.inc index e04f618b81e..e04f618b81e 100644 --- a/mysql-test/extra/rpl_tests/rpl_checksum_cache.inc +++ b/mysql-test/suite/rpl/include/rpl_checksum_cache.inc diff --git a/mysql-test/extra/rpl_tests/rpl_commit_after_flush.test b/mysql-test/suite/rpl/include/rpl_commit_after_flush.test index 7de4f421c35..7de4f421c35 100644 --- a/mysql-test/extra/rpl_tests/rpl_commit_after_flush.test +++ b/mysql-test/suite/rpl/include/rpl_commit_after_flush.test diff --git a/mysql-test/extra/rpl_tests/rpl_conflicts.test b/mysql-test/suite/rpl/include/rpl_conflicts.test index a8c796af50c..a8c796af50c 100644 --- a/mysql-test/extra/rpl_tests/rpl_conflicts.test +++ b/mysql-test/suite/rpl/include/rpl_conflicts.test diff --git a/mysql-test/extra/rpl_tests/rpl_corruption.inc b/mysql-test/suite/rpl/include/rpl_corruption.inc index 048a9d74249..048a9d74249 100644 --- a/mysql-test/extra/rpl_tests/rpl_corruption.inc +++ b/mysql-test/suite/rpl/include/rpl_corruption.inc diff --git a/mysql-test/extra/rpl_tests/rpl_ddl.test b/mysql-test/suite/rpl/include/rpl_ddl.test index f11cd979ba8..e3083a7f3ae 100644 --- a/mysql-test/extra/rpl_tests/rpl_ddl.test +++ b/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 b/mysql-test/suite/rpl/include/rpl_deadlock.test index e9191d5fcd8..e9191d5fcd8 100644 --- a/mysql-test/extra/rpl_tests/rpl_deadlock.test +++ b/mysql-test/suite/rpl/include/rpl_deadlock.test diff --git a/mysql-test/extra/rpl_tests/rpl_delete_no_where.test b/mysql-test/suite/rpl/include/rpl_delete_no_where.test index 914bedc6b67..914bedc6b67 100644 --- a/mysql-test/extra/rpl_tests/rpl_delete_no_where.test +++ b/mysql-test/suite/rpl/include/rpl_delete_no_where.test diff --git a/mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.inc b/mysql-test/suite/rpl/include/rpl_drop_create_temp_table.inc index a7ee54658f8..a7ee54658f8 100644 --- a/mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.inc +++ b/mysql-test/suite/rpl/include/rpl_drop_create_temp_table.inc diff --git a/mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.test b/mysql-test/suite/rpl/include/rpl_drop_create_temp_table.test index ffd7fe1a5c4..ef025eb96ca 100644 --- a/mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.test +++ b/mysql-test/suite/rpl/include/rpl_drop_create_temp_table.test @@ -64,7 +64,7 @@ # # # This test uses the commands available at: -# extra/rpl_tests/rpl_drop_create_temp_table.inc +# suite/rpl/include/rpl_drop_create_temp_table.inc # ############################################################################### @@ -77,7 +77,7 @@ call mtr.add_suppression("Unsafe statement written to the binary log using state --let $tot_table= 2 SET @commands= 'configure'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc --echo ######################################################################### --echo # 1 - Tables dropped by "DROP TEMPORARY TABLE" @@ -89,195 +89,195 @@ connection master; --echo #1) Generates in the binlog what follows: --echo # SET @commands= 'Drop-Temp-T-Temp'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'Drop-Temp-N-Temp'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'Drop-Temp-Xe-Temp'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'Drop-Temp-If-Xe-Temp'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'Drop-Temp-TXe-Temp'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'Drop-Temp-If-TXe-Temp'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'Drop-Temp-NXe-Temp'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'Drop-Temp-If-NXe-Temp'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'Drop-Temp-TN-Temp'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'Drop-Temp-TT-Temp'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'Drop-Temp-NN-Temp'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc --echo --echo # --echo #2) Generates in the binlog what follows: --echo # SET @commands= 'B T Drop-Temp-T-Temp C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-T-Temp N Drop-Temp-T-Temp C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-N-Temp C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-N-Temp N Drop-Temp-N-Temp C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-Xe-Temp C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-Xe-Temp N Drop-Temp-Xe-Temp C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-If-Xe-Temp C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-If-Xe-Temp N Drop-Temp-If-Xe-Temp C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-TXe-Temp C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-TXe-Temp N Drop-Temp-TXe-Temp C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-If-TXe-Temp C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-If-TXe-Temp N Drop-Temp-If-TXe-Temp C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-NXe-Temp C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-NXe-Temp N Drop-Temp-NXe-Temp C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-If-NXe-Temp C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-If-NXe-Temp N Drop-Temp-If-NXe-Temp C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-TN-Temp C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-TN-Temp N Drop-Temp-TN-Temp C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-TT-Temp C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-TT-Temp N Drop-Temp-TT-Temp C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-NN-Temp C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-NN-Temp N Drop-Temp-NN-Temp C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-NN-Temp N Drop-Temp-NN-Temp Ne C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-NN-Temp N Drop-Temp-NN-Temp Te C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-NN-Temp N Drop-Temp-NN-Temp NeT-trig C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc --echo --echo # --echo #3) Generates in the binlog what follows: --echo # SET @commands= 'B T Drop-Temp-T-Temp R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-T-Temp N Drop-Temp-T-Temp R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-N-Temp R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-N-Temp N Drop-Temp-N-Temp R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-Xe-Temp R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-Xe-Temp N Drop-Temp-Xe-Temp R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-If-Xe-Temp R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-If-Xe-Temp N Drop-Temp-If-Xe-Temp R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-TXe-Temp R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-TXe-Temp N Drop-Temp-TXe-Temp R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-If-TXe-Temp R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-If-TXe-Temp N Drop-Temp-If-TXe-Temp R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-NXe-Temp R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-NXe-Temp N Drop-Temp-NXe-Temp R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-If-NXe-Temp R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-If-NXe-Temp N Drop-Temp-If-NXe-Temp R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-TN-Temp R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-TN-Temp N Drop-Temp-TN-Temp R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-TT-Temp R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-TT-Temp N Drop-Temp-TT-Temp R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-NN-Temp R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-NN-Temp N Drop-Temp-NN-Temp R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-NN-Temp N Drop-Temp-NN-Temp Ne R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-NN-Temp N Drop-Temp-NN-Temp Te R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Temp-NN-Temp N Drop-Temp-NN-Temp NeT-trig R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc --echo ######################################################################### --echo # 2 - Tables dropped by "DROP TABLE" @@ -289,86 +289,86 @@ connection master; --echo #1) Generates in the binlog what follows: --echo # SET @commands= 'Drop-T'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'Drop-N'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'Drop-Xe'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'Drop-If-Xe'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'Drop-TXe'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'Drop-If-TXe'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'Drop-NXe'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'Drop-If-NXe'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'Drop-TN'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'Drop-TT'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'Drop-NN'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'Drop-N-TN-Temp'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'Drop-TN-Temp'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc --echo --echo # --echo #2) Generates in the binlog what follows: --echo # SET @commands= 'B T Drop-T'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-N'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-Xe'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-If-Xe'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-TXe'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-If-TXe'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-NXe'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-If-NXe'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-TN'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-TT'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-NN'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-N-TN-Temp'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B T Drop-TN-Temp'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc --echo ######################################################################### --echo # 3 - CREATE TEMPORARY TABLE @@ -380,48 +380,48 @@ connection master; --echo #1) Generates in the binlog what follows: --echo # SET @commands= 'Drop-Temp-N-Temp Create-N-Temp Drop-Temp-N-Temp Drop-Temp-N-Temp'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc --echo --echo # --echo #2) Generates in the binlog what follows: --echo # SET @commands= 'B T Drop-Temp-N-Temp Create-N-Temp Drop-Temp-N-Temp Drop-Temp-N-Temp C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp Ne C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp Te C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp NeT-trig C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc --echo --echo # --echo #3) Generates in the binlog what follows: --echo # SET @commands= 'B T Drop-Temp-N-Temp Create-N-Temp Drop-Temp-N-Temp Drop-Temp-N-Temp R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp Ne R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp Te R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp NeT-trig R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc --echo ######################################################################### --echo # 4 - CHANGING TEMPORARY TABLES @@ -433,25 +433,25 @@ connection master; --echo #1) Generates in the binlog what follows: --echo # SET @commands= 'B N N-Temp N-SELECT-N-Temp N-Temp C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B N N-Temp T-SELECT-N-Temp N-Temp C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B N N-Temp N-SELECT-T-Temp N-Temp C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B N N-Temp T-SELECT-T-Temp N-Temp C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B N N-Temp T-SELECT-T-Temp N-Temp Ne C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B N N-Temp T-SELECT-T-Temp N-Temp Te C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B N N-Temp T-SELECT-T-Temp N-Temp NeT-trig C'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc --echo --echo @@ -459,25 +459,25 @@ SET @commands= 'B N N-Temp T-SELECT-T-Temp N-Temp NeT-trig C'; --echo #2) Generates in the binlog what follows: --echo # SET @commands= 'B N N-Temp N-SELECT-N-Temp N-Temp R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B N N-Temp T-SELECT-N-Temp N-Temp R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B N N-Temp N-SELECT-T-Temp N-Temp R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B N N-Temp T-SELECT-T-Temp N-Temp R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B N N-Temp T-SELECT-T-Temp N-Temp Ne R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B N N-Temp T-SELECT-T-Temp N-Temp Te R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc SET @commands= 'B N N-Temp T-SELECT-T-Temp N-Temp NeT-trig R'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc --echo ################################################################################### --echo # CHECK CONSISTENCY @@ -499,4 +499,4 @@ if (`select @@session.binlog_format != 'STATEMENT'`) --echo # CLEAN --echo ######################################################################### SET @commands= 'clean'; ---source extra/rpl_tests/rpl_drop_create_temp_table.inc +--source suite/rpl/include/rpl_drop_create_temp_table.inc diff --git a/mysql-test/extra/rpl_tests/rpl_extra_col_master.test b/mysql-test/suite/rpl/include/rpl_extra_col_master.test index 02645a577f5..02645a577f5 100644 --- a/mysql-test/extra/rpl_tests/rpl_extra_col_master.test +++ b/mysql-test/suite/rpl/include/rpl_extra_col_master.test diff --git a/mysql-test/extra/rpl_tests/rpl_extra_col_slave.test b/mysql-test/suite/rpl/include/rpl_extra_col_slave.test index a58fa85a72d..a58fa85a72d 100644 --- a/mysql-test/extra/rpl_tests/rpl_extra_col_slave.test +++ b/mysql-test/suite/rpl/include/rpl_extra_col_slave.test diff --git a/mysql-test/extra/rpl_tests/rpl_failed_optimize.test b/mysql-test/suite/rpl/include/rpl_failed_optimize.test index af048aeb92a..af048aeb92a 100644 --- a/mysql-test/extra/rpl_tests/rpl_failed_optimize.test +++ b/mysql-test/suite/rpl/include/rpl_failed_optimize.test diff --git a/mysql-test/extra/rpl_tests/rpl_flsh_tbls.test b/mysql-test/suite/rpl/include/rpl_flsh_tbls.test index a8cec3d2a1a..a8cec3d2a1a 100644 --- a/mysql-test/extra/rpl_tests/rpl_flsh_tbls.test +++ b/mysql-test/suite/rpl/include/rpl_flsh_tbls.test diff --git a/mysql-test/extra/rpl_tests/rpl_foreign_key.test b/mysql-test/suite/rpl/include/rpl_foreign_key.test index d10deece1b1..d10deece1b1 100644 --- a/mysql-test/extra/rpl_tests/rpl_foreign_key.test +++ b/mysql-test/suite/rpl/include/rpl_foreign_key.test diff --git a/mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test b/mysql-test/suite/rpl/include/rpl_get_master_version_and_clock.test index eb0e5e21d62..eb0e5e21d62 100644 --- a/mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test +++ b/mysql-test/suite/rpl/include/rpl_get_master_version_and_clock.test diff --git a/mysql-test/extra/rpl_tests/rpl_gtid_basic.inc b/mysql-test/suite/rpl/include/rpl_gtid_basic.inc index 68a5d05ffe9..68a5d05ffe9 100644 --- a/mysql-test/extra/rpl_tests/rpl_gtid_basic.inc +++ b/mysql-test/suite/rpl/include/rpl_gtid_basic.inc diff --git a/mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test b/mysql-test/suite/rpl/include/rpl_implicit_commit_binlog.test index 0b6402308ce..0b6402308ce 100644 --- a/mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test +++ b/mysql-test/suite/rpl/include/rpl_implicit_commit_binlog.test diff --git a/mysql-test/extra/rpl_tests/rpl_incident.inc b/mysql-test/suite/rpl/include/rpl_incident.inc index 350a2086681..350a2086681 100644 --- a/mysql-test/extra/rpl_tests/rpl_incident.inc +++ b/mysql-test/suite/rpl/include/rpl_incident.inc diff --git a/mysql-test/extra/rpl_tests/rpl_init_slave_errors.inc b/mysql-test/suite/rpl/include/rpl_init_slave_errors.inc index 4fdea651edd..4fdea651edd 100644 --- a/mysql-test/extra/rpl_tests/rpl_init_slave_errors.inc +++ b/mysql-test/suite/rpl/include/rpl_init_slave_errors.inc diff --git a/mysql-test/extra/rpl_tests/rpl_innodb.test b/mysql-test/suite/rpl/include/rpl_innodb.test index 2fb1a1c5c79..2fb1a1c5c79 100644 --- a/mysql-test/extra/rpl_tests/rpl_innodb.test +++ b/mysql-test/suite/rpl/include/rpl_innodb.test diff --git a/mysql-test/extra/rpl_tests/rpl_insert_delayed.test b/mysql-test/suite/rpl/include/rpl_insert_delayed.test index 1a9c4a1163c..1a9c4a1163c 100644 --- a/mysql-test/extra/rpl_tests/rpl_insert_delayed.test +++ b/mysql-test/suite/rpl/include/rpl_insert_delayed.test diff --git a/mysql-test/extra/rpl_tests/rpl_insert_id.test b/mysql-test/suite/rpl/include/rpl_insert_id.test index 32d861bd45a..32d861bd45a 100644 --- a/mysql-test/extra/rpl_tests/rpl_insert_id.test +++ b/mysql-test/suite/rpl/include/rpl_insert_id.test diff --git a/mysql-test/extra/rpl_tests/rpl_insert_id_pk.test b/mysql-test/suite/rpl/include/rpl_insert_id_pk.test index f6152180e7a..f6152180e7a 100644 --- a/mysql-test/extra/rpl_tests/rpl_insert_id_pk.test +++ b/mysql-test/suite/rpl/include/rpl_insert_id_pk.test diff --git a/mysql-test/extra/rpl_tests/rpl_insert_ignore.test b/mysql-test/suite/rpl/include/rpl_insert_ignore.test index f422ef35f8c..f422ef35f8c 100644 --- a/mysql-test/extra/rpl_tests/rpl_insert_ignore.test +++ b/mysql-test/suite/rpl/include/rpl_insert_ignore.test diff --git a/mysql-test/extra/rpl_tests/rpl_loaddata.test b/mysql-test/suite/rpl/include/rpl_loaddata.test index f0933c1023f..f0933c1023f 100644 --- a/mysql-test/extra/rpl_tests/rpl_loaddata.test +++ b/mysql-test/suite/rpl/include/rpl_loaddata.test diff --git a/mysql-test/extra/rpl_tests/rpl_loaddata_local.inc b/mysql-test/suite/rpl/include/rpl_loaddata_local.inc index 20962d74e98..20962d74e98 100644 --- a/mysql-test/extra/rpl_tests/rpl_loaddata_local.inc +++ b/mysql-test/suite/rpl/include/rpl_loaddata_local.inc diff --git a/mysql-test/extra/rpl_tests/rpl_loadfile.inc b/mysql-test/suite/rpl/include/rpl_loadfile.inc index e43c003b29c..9cd64530690 100644 --- a/mysql-test/extra/rpl_tests/rpl_loadfile.inc +++ b/mysql-test/suite/rpl/include/rpl_loadfile.inc @@ -18,7 +18,7 @@ -- source include/have_binlog_format_mixed_or_row.inc -- source include/master-slave.inc --- source extra/rpl_tests/rpl_loadfile.test +-- source suite/rpl/include/rpl_loadfile.test # BUG#39701: Mixed binlog format does not switch to row mode on LOAD_FILE # diff --git a/mysql-test/extra/rpl_tests/rpl_loadfile.test b/mysql-test/suite/rpl/include/rpl_loadfile.test index 9073e5e3d9f..9073e5e3d9f 100644 --- a/mysql-test/extra/rpl_tests/rpl_loadfile.test +++ b/mysql-test/suite/rpl/include/rpl_loadfile.test diff --git a/mysql-test/extra/rpl_tests/rpl_log.test b/mysql-test/suite/rpl/include/rpl_log.test index f885602eaad..f885602eaad 100644 --- a/mysql-test/extra/rpl_tests/rpl_log.test +++ b/mysql-test/suite/rpl/include/rpl_log.test diff --git a/mysql-test/extra/rpl_tests/rpl_max_relay_size.test b/mysql-test/suite/rpl/include/rpl_max_relay_size.test index 0fcff5ebe6c..0fcff5ebe6c 100644 --- a/mysql-test/extra/rpl_tests/rpl_max_relay_size.test +++ b/mysql-test/suite/rpl/include/rpl_max_relay_size.test diff --git a/mysql-test/extra/rpl_tests/rpl_mixing_engines.inc b/mysql-test/suite/rpl/include/rpl_mixing_engines.inc index c71c45a57c5..c71c45a57c5 100644 --- a/mysql-test/extra/rpl_tests/rpl_mixing_engines.inc +++ b/mysql-test/suite/rpl/include/rpl_mixing_engines.inc diff --git a/mysql-test/extra/rpl_tests/rpl_mixing_engines.test b/mysql-test/suite/rpl/include/rpl_mixing_engines.test index e4a257371a7..fd4663072b3 100644 --- a/mysql-test/extra/rpl_tests/rpl_mixing_engines.test +++ b/mysql-test/suite/rpl/include/rpl_mixing_engines.test @@ -248,7 +248,7 @@ call mtr.add_suppression("Unsafe statement written to the binary log using state --let $verbose= 1 --let $commands= configure ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo ######################################################################### --echo # 1 - MIXING TRANSACTIONAL and NON-TRANSACTIONAL TABLES @@ -266,16 +266,16 @@ connection master; --echo # --> MIXED "B T C" entries, format S. --echo # --let $commands= T ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= T-trig ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= T-func ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= T-proc ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo @@ -289,16 +289,16 @@ connection master; --echo # --> MIXED empty. --echo # --let $commands= eT ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= Te ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= Te-trig ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= Te-func ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo --echo @@ -311,16 +311,16 @@ connection master; --echo # --> MIXED "B N C" entry, format S. --echo # --let $commands= N ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= N-trig ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= N-func ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= N-proc ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo @@ -334,16 +334,16 @@ connection master; --echo # --> MIXED "B N C" entry, format S. --echo # --let $commands= eN ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= Ne ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= Ne-trig ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= Ne-func ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo --echo @@ -357,28 +357,28 @@ connection master; --echo # --> MIXED "B N T B T C" entries, format R. --echo # --let $commands= tN ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= nT ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= NT ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= NT-trig ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= NT-func ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= TN ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= TN-trig ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= TN-func ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo @@ -392,22 +392,22 @@ connection master; --echo # --> ROW "B N C" entry, format R. --echo # --> MIXED "B N C" entry, format R. --let $commands= tNe ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= nTe ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= NeT-trig ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= NeT-func ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= TeN-trig ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= TeN-func ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo --echo @@ -420,52 +420,52 @@ connection master; --echo # --> MIXED "B T T C" entries, format S --echo # --let $commands= B T T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T T-trig C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T T-func C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T T-proc C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-trig T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-trig T-trig C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-trig T-func C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-trig T-proc C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-func T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-func T-trig C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-func T-func C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-func T-proc C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-proc T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-proc T-trig C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-proc T-func C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-proc T-proc C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo @@ -479,28 +479,28 @@ connection master; --echo # --> MIXED "B T C" entries, format S. --echo # --let $commands= B T eT C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T Te C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T Te-trig C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T Te-func C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B eT T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B Te T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B Te-trig T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B Te-func T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo @@ -514,52 +514,52 @@ connection master; --echo # --> MIXED empty. --echo # --let $commands= B T T R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T T-trig R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T T-func R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T T-proc R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-trig T R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-trig T-trig R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-trig T-func R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-trig T-proc R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-func T R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-func T-trig R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-func T-func R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-func T-proc R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-proc T R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-proc T-trig R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-proc T-func R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-proc T-proc R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo @@ -573,28 +573,28 @@ connection master; --echo # --> MIXED empty. --echo # --let $commands= B T eT R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T Te R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T Te-trig R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T Te-func R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B eT T R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B Te T R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B Te-trig T R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B Te-func T R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo @@ -608,52 +608,52 @@ connection master; --echo # --> MIXED "B N C B N C" entries, format S. --echo # --let $commands= B N N C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N N-trig C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N N-func C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N N-proc C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-trig N C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-trig N-trig C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-trig N-func C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-trig N-proc C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-func N C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-func N-trig C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-func N-func C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-func N-proc C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-proc N C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-proc N-trig C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-proc N-func C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-proc N-proc C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo @@ -667,28 +667,28 @@ connection master; --echo # --> MIXED "B N C B N C" entries, format S. --echo # --let $commands= B N eN C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N Ne C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N Ne-trig C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N Ne-func C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B eN N C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B Ne N C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B Ne-trig N C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B Ne-func N C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo @@ -702,52 +702,52 @@ connection master; --echo # --> MIXED "B N C B N C" entries, format S. --echo # --let $commands= B N N R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N N-trig R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N N-func R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N N-proc R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-trig N R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-trig N-trig R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-trig N-func R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-trig N-proc R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-func N R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-func N-trig R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-func N-func R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-func N-proc R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-proc N R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-proc N-trig R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-proc N-func R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-proc N-proc R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo @@ -761,28 +761,28 @@ connection master; --echo # --> MIXED "B N C B N C" entries, format S. --echo # --let $commands= B N eN R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N Ne R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N Ne-trig R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N Ne-func R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B eN N R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B Ne N R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B Ne-trig N R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B Ne-func N R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo @@ -796,52 +796,52 @@ connection master; --echo # --> MIXED "B N C B T C" entries, format R in N and S in T. --echo # --let $commands= B T N C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T N-trig C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T N-func C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T N-proc C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-trig N C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-trig N-trig C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-trig N-func C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-trig N-proc C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-func N C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-func N-trig C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-func N-func C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-func N-proc C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-proc N C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-proc N-trig C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-proc N-func C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-proc N-proc C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo @@ -859,16 +859,16 @@ connection master; --echo # --> MIXED "B N C B T C" entries, format R in N and S in T. --echo # --let $commands= B eT N C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B Te N C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T eN C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T Ne C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo @@ -882,52 +882,52 @@ connection master; --echo # --> MIXED "B N C" entry, format R. --echo # --let $commands= B T N R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T N-trig R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T N-func R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T N-proc R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-trig N R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-trig N-trig R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-trig N-func R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-trig N-proc R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-func N R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-func N-trig R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-func N-func R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-func N-proc R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-proc N R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-proc N-trig R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-proc N-func R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T-proc N-proc R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo @@ -945,16 +945,16 @@ connection master; --echo # --> MIXED "B N C" entry, format R. --echo # --let $commands= B eT N R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B Te N R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T eN R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T Ne R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc @@ -969,52 +969,52 @@ connection master; --echo # --> MIXED "B N C B T C" entries, format S. --echo # --let $commands= B N T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N T-trig C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N T-func C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N T-proc C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-trig T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-trig T-trig C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-trig T-func C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-trig T-proc C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-func T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-func T-trig C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-func T-func C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-func T-proc C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-proc T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-proc T-trig C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-proc T-func C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-proc T-proc C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo @@ -1029,52 +1029,52 @@ connection master; --echo # --let $commands= B N T R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N T-proc R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N T-trig R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N T-func R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-trig T R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-trig T-trig R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-trig T-func R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-trig T-proc R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-func T R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-func T-trig R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-func T-func R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-func T-proc R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-proc T R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-proc T-proc R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-proc T-trig R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N-proc T-func R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo @@ -1089,28 +1089,28 @@ connection master; --echo # --> MIXED "B N C B T T C" entries, format R in N/T and format S in T. --echo # --let $commands= B tN T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B nT T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B NT T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B NT-trig T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B NT-func T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B TN T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B TN-trig T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B TN-func T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo @@ -1125,22 +1125,22 @@ connection master; --echo # --> MIXED "B N C B T T C" entries, format R in N/T and format S in T. --echo # --let $commands= B tNe T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B nTe T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B NeT-trig T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B NeT-func T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B TeN-trig T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B TeN-func T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo @@ -1155,28 +1155,28 @@ connection master; --echo # --> MIXED "B N C" entry, format R. --echo # --let $commands= B tN T R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B nT T R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B NT T R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B NT-trig T R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B NT-func T R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B TN T R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B TN-trig T R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B TN-func T R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo @@ -1191,22 +1191,22 @@ connection master; --echo # --> MIXED "B N C" entry, format R. --echo # --let $commands= B tNe T R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B nTe T R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B NeT-trig T R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B NeT-func T R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B TeN-trig T R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B TeN-func T R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo @@ -1220,28 +1220,28 @@ connection master; --echo # --> MIXED "B N C B T T C" entries, format R in N/T and format S in T. --echo # --let $commands= B T tN C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T nT C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T NT C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T NT-trig C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T NT-func C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T TN C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T TN-trig C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T TN-func C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo @@ -1255,22 +1255,22 @@ connection master; --echo # --> MIXED "B N C B T C" entry, format R. --echo # --let $commands= B T tNe C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T nTe C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T NeT-trig C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T NeT-func C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T TeN-trig C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T TeN-func C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo --echo @@ -1283,28 +1283,28 @@ connection master; --echo # --> MIXED "B N C" entry, format R. --echo # --let $commands= B T tN R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T nT R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T NT R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T NT-trig R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T NT-func R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T TN R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T TN-trig R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T TN-func R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo @@ -1318,22 +1318,22 @@ connection master; --echo # --> MIXED "B N C" entry, format R. --echo # --let $commands= B T tNe R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T nTe R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T NeT-trig R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T NeT-func R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T TeN-trig R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T TeN-func R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo @@ -1349,28 +1349,28 @@ connection master; --echo # --> MIXED "B N C B N C B T C" entries, format R. --echo # --let $commands= B tN N C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B nT N C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B NT N C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B NT-trig N C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B NT-func N C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B TN N C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B TN-trig N C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B TN-func N C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo @@ -1386,22 +1386,22 @@ connection master; --echo # --> MIXED "B N C B N C B T C" entries, format R. --echo # --let $commands= B tNe N C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B nTe N C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B NeT-trig N C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B NeT-func N C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B TeN-trig N C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B TeN-func N C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo --echo @@ -1416,28 +1416,28 @@ connection master; --echo # --> MIXED "B N C B N C" entries, format R. --echo # --let $commands= B tN N R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B nT N R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B NT N R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B NT-trig N R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B NT-func N R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B TN N R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B TN-trig N R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B TN-func N R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo @@ -1453,22 +1453,22 @@ connection master; --echo # --> MIXED "B N C B N C" entries, format R. --echo # --let $commands= B tNe N R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B nTe N R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B NeT-trig N R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B NeT-func N R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B TeN-trig N R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B TeN-func N R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo @@ -1484,28 +1484,28 @@ connection master; --echo # --let $commands= B N tN C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N nT C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N NT C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N NT-trig C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N NT-func C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N TN C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N TN-trig C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N TN-func C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc @@ -1521,22 +1521,22 @@ connection master; --echo # --> MIXED "B N C B N C" entries, format S in first N and format R in the other. --echo # --let $commands= B N tNe C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N nTe C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N NeT-trig C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N NeT-func C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N TeN-trig C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N TeN-func C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo @@ -1552,28 +1552,28 @@ connection master; --echo # --let $commands= B N tN R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N nT R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N NT R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N NT-trig R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N NT-func R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N TN R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N TN-trig R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N TN-func R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo @@ -1588,58 +1588,58 @@ connection master; --echo # --> MIXED "B N C B N C" entries, format S in first N and format R in the other. --echo # --let $commands= B N tNe R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N nTe R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N NeT-trig R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N NeT-func R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N TeN-trig R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N TeN-func R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo ################################################################################### --echo # 2 - SAVEPOINT --echo ################################################################################### --let $commands= B T Sn T Rn C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N T Sn T Rn C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T N Sn T Rn C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T Sn N T Rn C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo ################################################################################### --echo # 3 - CREATE TABLE...SELECT --echo ################################################################################### --let $commands= CSe-T->T CS-T->T drop-CS ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= CSe-N->N CS-N->N drop-CS ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= CSe-T->N CS-T->N drop-CS ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= CSe-N->T CS-N->T drop-CS ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= CSe-N->T CS-N->T drop-CS ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= CSe-N->T CS-N->T drop-CS ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo ################################################################################### @@ -1647,153 +1647,153 @@ connection master; --echo ################################################################################### --let $commands= CS-T->T ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= trunc-CS-T B T IS-T<-N T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= trunc-CS-T B T ISe-T<-N T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= trunc-CS-T B IS-T<-N T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= trunc-CS-T B ISe-T<-N T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= drop-CS ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= CS-T->T ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= trunc-CS-T B T IS-T<-T T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= trunc-CS-T B T ISe-T<-T T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= trunc-CS-T B IS-T<-T T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= trunc-CS-T B ISe-T<-T T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= drop-CS ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= CS-N->N ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= trunc-CS-N B T IS-N<-T T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= trunc-CS-N B T ISe-N<-T T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= trunc-CS-N B IS-N<-T T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= trunc-CS-N B ISe-N<-T T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= drop-CS ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= CS-N->N ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= trunc-CS-N B T IS-N<-N T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= trunc-CS-N B T ISe-N<-N T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= trunc-CS-N B IS-N<-N T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= trunc-CS-N B ISe-N<-N T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= drop-CS ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo ################################################################################### --echo # 5 - ROLLBACK TEMPORARY TABLE --echo ################################################################################### --let $commands= B T CT R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= drop-CT ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T Sn T CT Rn R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= drop-CT ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B T CT T R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= drop-CT ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B tN CT T R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= drop-CT ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B CT T R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= drop-CT ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B N CT T R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= drop-CT ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo ################################################################################### --echo # 5 - SET WITH ROW CHANGES --echo ################################################################################### --let $commands= set-T ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= set-N ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= set-NT ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B set-N set-T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B set-T set-N C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B set-N set-T R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B set-T set-N R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B set-NT set-T C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B set-T set-NT C ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B set-NT set-T R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --let $commands= B set-T set-NT R ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc --echo ################################################################################### @@ -1813,4 +1813,4 @@ if (`select @@session.binlog_direct_non_transactional_updates = 0 || @@session.b --echo # CLEAN --echo ################################################################################### --let $commands= clean ---source extra/rpl_tests/rpl_mixing_engines.inc +--source suite/rpl/include/rpl_mixing_engines.inc diff --git a/mysql-test/extra/rpl_tests/rpl_multi_query.test b/mysql-test/suite/rpl/include/rpl_multi_query.test index ae2a3aa45d2..ae2a3aa45d2 100644 --- a/mysql-test/extra/rpl_tests/rpl_multi_query.test +++ b/mysql-test/suite/rpl/include/rpl_multi_query.test diff --git a/mysql-test/extra/rpl_tests/rpl_multi_update.test b/mysql-test/suite/rpl/include/rpl_multi_update.test index cdbdbc191d7..cdbdbc191d7 100644 --- a/mysql-test/extra/rpl_tests/rpl_multi_update.test +++ b/mysql-test/suite/rpl/include/rpl_multi_update.test diff --git a/mysql-test/extra/rpl_tests/rpl_multi_update2.test b/mysql-test/suite/rpl/include/rpl_multi_update2.test index b85927a2aed..b85927a2aed 100644 --- a/mysql-test/extra/rpl_tests/rpl_multi_update2.test +++ b/mysql-test/suite/rpl/include/rpl_multi_update2.test diff --git a/mysql-test/extra/rpl_tests/rpl_multi_update3.test b/mysql-test/suite/rpl/include/rpl_multi_update3.test index f7d4815e9e5..f7d4815e9e5 100644 --- a/mysql-test/extra/rpl_tests/rpl_multi_update3.test +++ b/mysql-test/suite/rpl/include/rpl_multi_update3.test diff --git a/mysql-test/extra/rpl_tests/rpl_not_null.test b/mysql-test/suite/rpl/include/rpl_not_null.test index cbb6b787f11..cbb6b787f11 100644 --- a/mysql-test/extra/rpl_tests/rpl_not_null.test +++ b/mysql-test/suite/rpl/include/rpl_not_null.test diff --git a/mysql-test/extra/rpl_tests/rpl_packet.inc b/mysql-test/suite/rpl/include/rpl_packet.inc index cbde486bcbb..cbde486bcbb 100644 --- a/mysql-test/extra/rpl_tests/rpl_packet.inc +++ b/mysql-test/suite/rpl/include/rpl_packet.inc diff --git a/mysql-test/extra/rpl_tests/rpl_parallel.inc b/mysql-test/suite/rpl/include/rpl_parallel.inc index 42354343084..42354343084 100644 --- a/mysql-test/extra/rpl_tests/rpl_parallel.inc +++ b/mysql-test/suite/rpl/include/rpl_parallel.inc diff --git a/mysql-test/extra/rpl_tests/rpl_parallel_show_binlog_events_purge_logs.inc b/mysql-test/suite/rpl/include/rpl_parallel_show_binlog_events_purge_logs.inc index 7801498adb4..7801498adb4 100644 --- a/mysql-test/extra/rpl_tests/rpl_parallel_show_binlog_events_purge_logs.inc +++ b/mysql-test/suite/rpl/include/rpl_parallel_show_binlog_events_purge_logs.inc diff --git a/mysql-test/extra/rpl_tests/rpl_partition.test b/mysql-test/suite/rpl/include/rpl_partition.test index 119e3bebc42..119e3bebc42 100644 --- a/mysql-test/extra/rpl_tests/rpl_partition.test +++ b/mysql-test/suite/rpl/include/rpl_partition.test diff --git a/mysql-test/extra/rpl_tests/rpl_record_compare.test b/mysql-test/suite/rpl/include/rpl_record_compare.test index 2bc088d17b4..2bc088d17b4 100644 --- a/mysql-test/extra/rpl_tests/rpl_record_compare.test +++ b/mysql-test/suite/rpl/include/rpl_record_compare.test diff --git a/mysql-test/extra/rpl_tests/rpl_relayrotate.inc b/mysql-test/suite/rpl/include/rpl_relayrotate.inc index ce638e419ff..4de554d3143 100644 --- a/mysql-test/extra/rpl_tests/rpl_relayrotate.inc +++ b/mysql-test/suite/rpl/include/rpl_relayrotate.inc @@ -14,5 +14,5 @@ -- source include/master-slave.inc let $engine_type=innodb; --- source extra/rpl_tests/rpl_relayrotate.test +-- source suite/rpl/include/rpl_relayrotate.test --source include/rpl_end.inc diff --git a/mysql-test/extra/rpl_tests/rpl_relayrotate.test b/mysql-test/suite/rpl/include/rpl_relayrotate.test index 28670fe0985..28670fe0985 100644 --- a/mysql-test/extra/rpl_tests/rpl_relayrotate.test +++ b/mysql-test/suite/rpl/include/rpl_relayrotate.test diff --git a/mysql-test/extra/rpl_tests/rpl_reset_slave.test b/mysql-test/suite/rpl/include/rpl_reset_slave.test index e7a78f36efc..e7a78f36efc 100644 --- a/mysql-test/extra/rpl_tests/rpl_reset_slave.test +++ b/mysql-test/suite/rpl/include/rpl_reset_slave.test diff --git a/mysql-test/extra/rpl_tests/rpl_row_001.test b/mysql-test/suite/rpl/include/rpl_row_001.test index 8eb684e0dff..8eb684e0dff 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_001.test +++ b/mysql-test/suite/rpl/include/rpl_row_001.test diff --git a/mysql-test/extra/rpl_tests/rpl_row_UUID.test b/mysql-test/suite/rpl/include/rpl_row_UUID.test index 368596d4fbc..368596d4fbc 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_UUID.test +++ b/mysql-test/suite/rpl/include/rpl_row_UUID.test diff --git a/mysql-test/extra/rpl_tests/rpl_row_annotate.test b/mysql-test/suite/rpl/include/rpl_row_annotate.test index 317a9c86539..317a9c86539 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_annotate.test +++ b/mysql-test/suite/rpl/include/rpl_row_annotate.test diff --git a/mysql-test/extra/rpl_tests/rpl_row_basic.test b/mysql-test/suite/rpl/include/rpl_row_basic.test index 33d5dd328f3..33d5dd328f3 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_basic.test +++ b/mysql-test/suite/rpl/include/rpl_row_basic.test diff --git a/mysql-test/extra/rpl_tests/rpl_row_blob.test b/mysql-test/suite/rpl/include/rpl_row_blob.test index 5cd7b6b4b29..5cd7b6b4b29 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_blob.test +++ b/mysql-test/suite/rpl/include/rpl_row_blob.test diff --git a/mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test b/mysql-test/suite/rpl/include/rpl_row_delayed_ins.test index bad308ff814..bad308ff814 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test +++ b/mysql-test/suite/rpl/include/rpl_row_delayed_ins.test diff --git a/mysql-test/extra/rpl_tests/rpl_row_func003.test b/mysql-test/suite/rpl/include/rpl_row_func003.test index f46f9eddc60..f46f9eddc60 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_func003.test +++ b/mysql-test/suite/rpl/include/rpl_row_func003.test diff --git a/mysql-test/extra/rpl_tests/rpl_row_img.test b/mysql-test/suite/rpl/include/rpl_row_img.test index b905b81c4c6..9cf2b6f9e9e 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_img.test +++ b/mysql-test/suite/rpl/include/rpl_row_img.test @@ -20,7 +20,7 @@ # -- let $server_2_engine= MyISAM # -- let $server_3_engine= InnoDB # -# -- source extra/rpl_tests/rpl_row_img.test +# -- source suite/rpl/include/rpl_row_img.test # -- connection server_1 diff --git a/mysql-test/extra/rpl_tests/rpl_row_img_blobs.test b/mysql-test/suite/rpl/include/rpl_row_img_blobs.test index 9d3a0a593e3..9a7063819e0 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_img_blobs.test +++ b/mysql-test/suite/rpl/include/rpl_row_img_blobs.test @@ -23,7 +23,7 @@ # -- let $server_2_engine= MyISAM # -- let $server_3_engine= InnoDB # -# -- source extra/rpl_tests/rpl_row_img_blobs.test +# -- source suite/rpl/include/rpl_row_img_blobs.test # -- connection server_1 diff --git a/mysql-test/extra/rpl_tests/rpl_row_sp002.test b/mysql-test/suite/rpl/include/rpl_row_sp002.test index 90c273eb026..90c273eb026 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_sp002.test +++ b/mysql-test/suite/rpl/include/rpl_row_sp002.test diff --git a/mysql-test/extra/rpl_tests/rpl_row_sp003.test b/mysql-test/suite/rpl/include/rpl_row_sp003.test index a8f25485f26..a8f25485f26 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_sp003.test +++ b/mysql-test/suite/rpl/include/rpl_row_sp003.test diff --git a/mysql-test/extra/rpl_tests/rpl_row_sp006.test b/mysql-test/suite/rpl/include/rpl_row_sp006.test index 16a8374ae7f..16a8374ae7f 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_sp006.test +++ b/mysql-test/suite/rpl/include/rpl_row_sp006.test diff --git a/mysql-test/extra/rpl_tests/rpl_row_sp007.test b/mysql-test/suite/rpl/include/rpl_row_sp007.test index 4a68dddfdc2..4a68dddfdc2 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_sp007.test +++ b/mysql-test/suite/rpl/include/rpl_row_sp007.test diff --git a/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test b/mysql-test/suite/rpl/include/rpl_row_tabledefs.test index 194079b160a..194079b160a 100644 --- a/mysql-test/extra/rpl_tests/rpl_row_tabledefs.test +++ b/mysql-test/suite/rpl/include/rpl_row_tabledefs.test diff --git a/mysql-test/extra/rpl_tests/rpl_semi_sync.inc b/mysql-test/suite/rpl/include/rpl_semi_sync.inc index 393b49372e1..393b49372e1 100644 --- a/mysql-test/extra/rpl_tests/rpl_semi_sync.inc +++ b/mysql-test/suite/rpl/include/rpl_semi_sync.inc diff --git a/mysql-test/extra/rpl_tests/rpl_set_null.test b/mysql-test/suite/rpl/include/rpl_set_null.test index 3755c8bbfa5..3755c8bbfa5 100644 --- a/mysql-test/extra/rpl_tests/rpl_set_null.test +++ b/mysql-test/suite/rpl/include/rpl_set_null.test diff --git a/mysql-test/extra/rpl_tests/rpl_show_binlog_events.inc b/mysql-test/suite/rpl/include/rpl_show_binlog_events.inc index 4530f8c639a..4530f8c639a 100644 --- a/mysql-test/extra/rpl_tests/rpl_show_binlog_events.inc +++ b/mysql-test/suite/rpl/include/rpl_show_binlog_events.inc diff --git a/mysql-test/suite/rpl/include/rpl_show_log_events_with_varying_options.inc b/mysql-test/suite/rpl/include/rpl_show_log_events_with_varying_options.inc new file mode 100644 index 00000000000..ce6f094a707 --- /dev/null +++ b/mysql-test/suite/rpl/include/rpl_show_log_events_with_varying_options.inc @@ -0,0 +1,11 @@ +# Include file for rpl_show_log_events.inc + +--let $binlog_limit= +--source suite/rpl/include/rpl_show_binlog_events.inc +--let $binlog_limit= 2 +--source suite/rpl/include/rpl_show_binlog_events.inc +--let $binlog_limit= 2,4 +--source suite/rpl/include/rpl_show_binlog_events.inc +--let $binlog_limit= +--let $binlog_file= +--source suite/rpl/include/rpl_show_binlog_events.inc diff --git a/mysql-test/extra/rpl_tests/rpl_show_relaylog_events.inc b/mysql-test/suite/rpl/include/rpl_show_relaylog_events.inc index d0a905d3b7d..d590eafdc40 100644 --- a/mysql-test/extra/rpl_tests/rpl_show_relaylog_events.inc +++ b/mysql-test/suite/rpl/include/rpl_show_relaylog_events.inc @@ -16,15 +16,15 @@ INSERT INTO t1 VALUES (3); --let $is_relay_log= 0 --let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1) ---source extra/rpl_tests/rpl_show_log_events_with_varying_options.inc +--source suite/rpl/include/rpl_show_log_events_with_varying_options.inc --sync_slave_with_master --let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1) ---source extra/rpl_tests/rpl_show_log_events_with_varying_options.inc +--source suite/rpl/include/rpl_show_log_events_with_varying_options.inc --let $is_relay_log= 1 --let $binlog_file= query_get_value(SHOW SLAVE STATUS, Relay_Log_File, 1) ---source extra/rpl_tests/rpl_show_log_events_with_varying_options.inc +--source suite/rpl/include/rpl_show_log_events_with_varying_options.inc # # PART II @@ -49,15 +49,15 @@ DROP TABLE t1; --let $is_relay_log= 0 --let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1) ---source extra/rpl_tests/rpl_show_log_events_with_varying_options.inc +--source suite/rpl/include/rpl_show_log_events_with_varying_options.inc --sync_slave_with_master --let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1) ---source extra/rpl_tests/rpl_show_log_events_with_varying_options.inc +--source suite/rpl/include/rpl_show_log_events_with_varying_options.inc --let $is_relay_log= 1 --let $binlog_file= query_get_value(SHOW SLAVE STATUS, Relay_Log_File, 1) ---source extra/rpl_tests/rpl_show_log_events_with_varying_options.inc +--source suite/rpl/include/rpl_show_log_events_with_varying_options.inc # clear show_binlog_event/show_relaylog_events parameters diff --git a/mysql-test/extra/rpl_tests/rpl_skip_replication.inc b/mysql-test/suite/rpl/include/rpl_skip_replication.inc index ac0beef414d..97fc961d438 100644 --- a/mysql-test/extra/rpl_tests/rpl_skip_replication.inc +++ b/mysql-test/suite/rpl/include/rpl_skip_replication.inc @@ -6,7 +6,7 @@ # Usage: # # --let $use_remote_mysqlbinlog= 1 # optional -# --source extra/rpl_tests/rpl_skip_replication.inc +# --source suite/rpl/include/rpl_skip_replication.inc # # The script uses MYSQLBINLOG to verify certain results. # By default, it uses binary logs directly. If it is undesirable, diff --git a/mysql-test/extra/rpl_tests/rpl_special_charset.inc b/mysql-test/suite/rpl/include/rpl_special_charset.inc index 641aa483d32..641aa483d32 100644 --- a/mysql-test/extra/rpl_tests/rpl_special_charset.inc +++ b/mysql-test/suite/rpl/include/rpl_special_charset.inc diff --git a/mysql-test/extra/rpl_tests/rpl_sporadic_master.inc b/mysql-test/suite/rpl/include/rpl_sporadic_master.inc index ad4c44cbf74..ad4c44cbf74 100644 --- a/mysql-test/extra/rpl_tests/rpl_sporadic_master.inc +++ b/mysql-test/suite/rpl/include/rpl_sporadic_master.inc diff --git a/mysql-test/extra/rpl_tests/rpl_ssl.inc b/mysql-test/suite/rpl/include/rpl_ssl.inc index aff5499c8e5..aff5499c8e5 100644 --- a/mysql-test/extra/rpl_tests/rpl_ssl.inc +++ b/mysql-test/suite/rpl/include/rpl_ssl.inc diff --git a/mysql-test/extra/rpl_tests/rpl_start_stop_slave.test b/mysql-test/suite/rpl/include/rpl_start_stop_slave.test index 32f33b2a31d..32f33b2a31d 100644 --- a/mysql-test/extra/rpl_tests/rpl_start_stop_slave.test +++ b/mysql-test/suite/rpl/include/rpl_start_stop_slave.test diff --git a/mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test b/mysql-test/suite/rpl/include/rpl_stm_EE_err2.test index 2f4435357ff..2f4435357ff 100644 --- a/mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test +++ b/mysql-test/suite/rpl/include/rpl_stm_EE_err2.test diff --git a/mysql-test/extra/rpl_tests/rpl_stm_create_if_not_exists.test b/mysql-test/suite/rpl/include/rpl_stm_create_if_not_exists.test index cecbd45c02a..cecbd45c02a 100644 --- a/mysql-test/extra/rpl_tests/rpl_stm_create_if_not_exists.test +++ b/mysql-test/suite/rpl/include/rpl_stm_create_if_not_exists.test diff --git a/mysql-test/extra/rpl_tests/rpl_stm_relay_ign_space.inc b/mysql-test/suite/rpl/include/rpl_stm_relay_ign_space.inc index 41339f539f8..41339f539f8 100644 --- a/mysql-test/extra/rpl_tests/rpl_stm_relay_ign_space.inc +++ b/mysql-test/suite/rpl/include/rpl_stm_relay_ign_space.inc diff --git a/mysql-test/extra/rpl_tests/rpl_stop_middle_group.test b/mysql-test/suite/rpl/include/rpl_stop_middle_group.test index 43c561c5b85..43c561c5b85 100644 --- a/mysql-test/extra/rpl_tests/rpl_stop_middle_group.test +++ b/mysql-test/suite/rpl/include/rpl_stop_middle_group.test diff --git a/mysql-test/extra/rpl_tests/rpl_stop_slave.test b/mysql-test/suite/rpl/include/rpl_stop_slave.test index 2ab59f56d7a..12f99ed12ea 100644 --- a/mysql-test/extra/rpl_tests/rpl_stop_slave.test +++ b/mysql-test/suite/rpl/include/rpl_stop_slave.test @@ -6,7 +6,7 @@ # # USEAGE: # --let $tmp_table_stm= a SQL statement -# --source extra/rpl_tests/rpl_stop_slave.test +# --source suite/rpl/include/rpl_stop_slave.test # if (!$tmp_table_stm) diff --git a/mysql-test/extra/rpl_tests/rpl_sv_relay_space.test b/mysql-test/suite/rpl/include/rpl_sv_relay_space.test index 6edbbf68266..6edbbf68266 100644 --- a/mysql-test/extra/rpl_tests/rpl_sv_relay_space.test +++ b/mysql-test/suite/rpl/include/rpl_sv_relay_space.test diff --git a/mysql-test/extra/rpl_tests/rpl_switch_stm_row_mixed.inc b/mysql-test/suite/rpl/include/rpl_switch_stm_row_mixed.inc index 31b80732c60..31b80732c60 100644 --- a/mysql-test/extra/rpl_tests/rpl_switch_stm_row_mixed.inc +++ b/mysql-test/suite/rpl/include/rpl_switch_stm_row_mixed.inc diff --git a/mysql-test/extra/rpl_tests/rpl_sync.inc b/mysql-test/suite/rpl/include/rpl_sync_test.inc index 1e2ec2ca83b..1e2ec2ca83b 100644 --- a/mysql-test/extra/rpl_tests/rpl_sync.inc +++ b/mysql-test/suite/rpl/include/rpl_sync_test.inc diff --git a/mysql-test/extra/rpl_tests/rpl_temporal_format_default_to_default.inc b/mysql-test/suite/rpl/include/rpl_temporal_format_default_to_default.inc index 6728ff55d6f..6728ff55d6f 100644 --- a/mysql-test/extra/rpl_tests/rpl_temporal_format_default_to_default.inc +++ b/mysql-test/suite/rpl/include/rpl_temporal_format_default_to_default.inc diff --git a/mysql-test/extra/rpl_tests/rpl_test_framework.inc b/mysql-test/suite/rpl/include/rpl_test_framework.inc index 9613d31bf1c..dbcdd317f8e 100644 --- a/mysql-test/extra/rpl_tests/rpl_test_framework.inc +++ b/mysql-test/suite/rpl/include/rpl_test_framework.inc @@ -31,7 +31,7 @@ # --let $rpl_topology= <topology specification> # --let $masters= <list of masters> # [--let $rpl_diff_servers= <list of servers>] -# --source extra/rpl_tests/rpl_test_framework.inc +# --source suite/rpl/include/rpl_test_framework.inc # # Parameters: # $next_number diff --git a/mysql-test/extra/rpl_tests/rpl_tmp_table_and_DDL.test b/mysql-test/suite/rpl/include/rpl_tmp_table_and_DDL.test index 9cf287281a0..9cf287281a0 100644 --- a/mysql-test/extra/rpl_tests/rpl_tmp_table_and_DDL.test +++ b/mysql-test/suite/rpl/include/rpl_tmp_table_and_DDL.test diff --git a/mysql-test/extra/rpl_tests/rpl_trig004.test b/mysql-test/suite/rpl/include/rpl_trig004.test index 4988fe87f8f..4988fe87f8f 100644 --- a/mysql-test/extra/rpl_tests/rpl_trig004.test +++ b/mysql-test/suite/rpl/include/rpl_trig004.test diff --git a/mysql-test/extra/rpl_tests/rpl_truncate.test b/mysql-test/suite/rpl/include/rpl_truncate.test index c1d70b4dab2..c169dfd0228 100644 --- a/mysql-test/extra/rpl_tests/rpl_truncate.test +++ b/mysql-test/suite/rpl/include/rpl_truncate.test @@ -5,9 +5,9 @@ --source include/master-slave.inc let $trunc_stmt = TRUNCATE TABLE; ---source extra/rpl_tests/rpl_truncate_helper.test +--source suite/rpl/include/rpl_truncate_helper.test let $trunc_stmt = DELETE FROM; ---source extra/rpl_tests/rpl_truncate_helper.test +--source suite/rpl/include/rpl_truncate_helper.test --source include/rpl_end.inc diff --git a/mysql-test/extra/rpl_tests/rpl_truncate_helper.test b/mysql-test/suite/rpl/include/rpl_truncate_helper.test index ddfba6c52c5..ddfba6c52c5 100644 --- a/mysql-test/extra/rpl_tests/rpl_truncate_helper.test +++ b/mysql-test/suite/rpl/include/rpl_truncate_helper.test diff --git a/mysql-test/extra/rpl_tests/rpl_typeconv.inc b/mysql-test/suite/rpl/include/rpl_typeconv.inc index 0f078854ec2..6d639087e05 100644 --- a/mysql-test/extra/rpl_tests/rpl_typeconv.inc +++ b/mysql-test/suite/rpl/include/rpl_typeconv.inc @@ -36,22 +36,22 @@ SELECT @@global.slave_type_conversions; # Checking strict interpretation of type conversions connection slave; SET GLOBAL SLAVE_TYPE_CONVERSIONS=''; -source extra/rpl_tests/type_conversions.test; +source suite/rpl/include/type_conversions.test; # Checking lossy integer type conversions connection slave; SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_NON_LOSSY'; -source extra/rpl_tests/type_conversions.test; +source suite/rpl/include/type_conversions.test; # Checking non-lossy integer type conversions connection slave; SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_LOSSY'; -source extra/rpl_tests/type_conversions.test; +source suite/rpl/include/type_conversions.test; # Checking all type conversions connection slave; SET GLOBAL SLAVE_TYPE_CONVERSIONS='ALL_LOSSY,ALL_NON_LOSSY'; -source extra/rpl_tests/type_conversions.test; +source suite/rpl/include/type_conversions.test; connection slave; --echo **** Result of conversions **** diff --git a/mysql-test/extra/rpl_tests/type_conversions.test b/mysql-test/suite/rpl/include/type_conversions.test index 0096fda3174..c10cfe57fda 100644 --- a/mysql-test/extra/rpl_tests/type_conversions.test +++ b/mysql-test/suite/rpl/include/type_conversions.test @@ -19,28 +19,28 @@ let $target_type = TINYBLOB; let $source_value = 'aaa'; let $target_value = 'aaa'; let $can_convert = 1; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= TINYBLOB; let $target_type= BLOB; let $source_value= 'aaa'; let $target_value= 'aaa'; let $can_convert= $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= TINYBLOB; let $target_type= MEDIUMBLOB; let $source_value= 'aaa'; let $target_value= 'aaa'; let $can_convert= $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= TINYBLOB; let $target_type= LONGBLOB; let $source_value= 'aaa'; let $target_value= 'aaa'; let $can_convert= $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; # BLOB @@ -49,28 +49,28 @@ let $target_type = TINYBLOB; let $source_value = 'aaa'; let $target_value = 'aaa'; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= BLOB; let $target_type= BLOB; let $source_value= 'aaa'; let $target_value= 'aaa'; let $can_convert= 1; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= BLOB; let $target_type= MEDIUMBLOB; let $source_value= 'aaa'; let $target_value= 'aaa'; let $can_convert= $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= BLOB; let $target_type= LONGBLOB; let $source_value= 'aaa'; let $target_value= 'aaa'; let $can_convert= $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; # MEDIUMBLOB @@ -79,28 +79,28 @@ let $target_type = TINYBLOB; let $source_value = 'aaa'; let $target_value = 'aaa'; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= MEDIUMBLOB; let $target_type= BLOB; let $source_value= 'aaa'; let $target_value= 'aaa'; let $can_convert= $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= MEDIUMBLOB; let $target_type= MEDIUMBLOB; let $source_value= 'aaa'; let $target_value= 'aaa'; let $can_convert= 1; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= MEDIUMBLOB; let $target_type= LONGBLOB; let $source_value= 'aaa'; let $target_value= 'aaa'; let $can_convert= $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; # LONGBLOB @@ -109,28 +109,28 @@ let $target_type = TINYBLOB; let $source_value = 'aaa'; let $target_value = 'aaa'; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= LONGBLOB; let $target_type= BLOB; let $source_value= 'aaa'; let $target_value= 'aaa'; let $can_convert= $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= LONGBLOB; let $target_type= MEDIUMBLOB; let $source_value= 'aaa'; let $target_value= 'aaa'; let $can_convert= $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= LONGBLOB; let $target_type= LONGBLOB; let $source_value= 'aaa'; let $target_value= 'aaa'; let $can_convert= 1; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; # BUG#49836 (additional tests - GEOMETRY TYPE) @@ -139,462 +139,462 @@ let $target_type = BLOB; let $source_value = PointFromText('POINT(10 10)'); let $target_value = PointFromText('POINT(10 10)'); let $can_convert = 0; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type = BLOB; let $target_type = GEOMETRY; let $source_value = 'aaa'; let $target_value = 'aaa'; let $can_convert = 0; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type = GEOMETRY; let $target_type = GEOMETRY; let $source_value = PointFromText('POINT(10 10)'); let $target_value = PointFromText('POINT(10 10)'); let $can_convert = 1; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type = BIT(1); let $target_type = BIT(1); let $source_value = b'1'; let $target_value = b'1'; let $can_convert = 1; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type = DATE; let $target_type = DATE; let $source_value = '2009-11-21'; let $target_value = '2009-11-21'; let $can_convert = 1; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type = ENUM('master','slave'); let $target_type = ENUM('master','slave'); let $source_value = 'master'; let $target_value = 'master'; let $can_convert = 1; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type = CHAR(10); let $target_type = ENUM('master','slave'); let $source_value = 'master'; let $target_value = 'master'; let $can_convert = 0; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type = CHAR(10); let $target_type = SET('master','slave'); let $source_value = 'master'; let $target_value = 'master'; let $can_convert = 0; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type = ENUM('master','slave'); let $target_type = CHAR(10); let $source_value = 'master'; let $target_value = 'master'; let $can_convert = 0; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type = SET('master','slave'); let $target_type = CHAR(10); let $source_value = 'master'; let $target_value = 'master'; let $can_convert = 0; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type = SET('master','slave'); let $target_type = SET('master','slave'); let $source_value = ''; let $target_value = ''; let $can_convert = 1; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type = SET('master','slave'); let $target_type = SET('master','slave'); let $source_value = 'master,slave'; let $target_value = 'master,slave'; let $can_convert = 1; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type = SET('0','1','2','3','4','5','6'); let $target_type = SET('0','1','2','3','4','5','6'); let $source_value = '5'; let $target_value = '5'; let $can_convert = 1; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type = SET('0','1','2','3','4','5','6'); let $target_type = SET('0','1','2','3','4','5','6','7','8','9','10'); let $source_value = '5'; let $target_value = '5'; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type = SET('0','1','2','3','4','5','6','7','8','9','10'); let $target_type = SET('0','1','2','3','4','5','6'); let $source_value = '5'; let $target_value = '5'; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type = SET('0','1','2','3','4','5','6','7','8','9','10'); let $target_type = SET('0','1','2','3','4','5','6'); let $source_value = '7'; let $target_value = ''; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type = TINYINT; let $target_type = TINYINT; let $source_value = 1; let $target_value = 1; let $can_convert = 1; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type = TINYINT; let $target_type = SMALLINT; let $source_value = 1; let $target_value = 1; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= TINYINT; let $target_type= MEDIUMINT; let $source_value= 1; let $target_value= 1; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= TINYINT; let $target_type= INT; let $source_value= 1; let $target_value= 1; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= TINYINT; let $target_type= BIGINT; let $source_value= 1; let $target_value= 1; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= SMALLINT; let $target_type= TINYINT; let $source_value= 1; let $target_value= 1; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= SMALLINT; let $target_type= TINYINT; let $source_value= 1 << 9; let $target_value= (1 << 7) - 1; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= SMALLINT; let $target_type= TINYINT UNSIGNED; let $source_value= 1 << 9; let $target_value= (1 << 8) - 1; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= SMALLINT; let $target_type= SMALLINT; let $source_value= 1; let $target_value= 1; let $can_convert = 1; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= SMALLINT; let $target_type= MEDIUMINT; let $source_value= 1; let $target_value= 1; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= SMALLINT; let $target_type= INT; let $source_value= 1; let $target_value= 1; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= SMALLINT; let $target_type= BIGINT; let $source_value= 1; let $target_value= 1; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= MEDIUMINT; let $target_type= TINYINT; let $source_value= 1; let $target_value= 1; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= MEDIUMINT; let $target_type= TINYINT; let $source_value= 1 << 20; let $target_value= (1 << 7) - 1; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= MEDIUMINT; let $target_type= TINYINT UNSIGNED; let $source_value= 1 << 20; let $target_value= (1 << 8) - 1; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= MEDIUMINT; let $target_type= SMALLINT; let $source_value= 1; let $target_value= 1; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= MEDIUMINT; let $target_type= MEDIUMINT; let $source_value= 1; let $target_value= 1; let $can_convert = 1; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= MEDIUMINT; let $target_type= INT; let $source_value= 1; let $target_value= 1; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= MEDIUMINT; let $target_type= BIGINT; let $source_value= 1; let $target_value= 1; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= INT; let $target_type= TINYINT; let $source_value= 1; let $target_value= 1; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= INT; let $target_type= TINYINT; let $source_value= (1 << 30); let $target_value= (1 << 7) - 1; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= INT; let $target_type= TINYINT UNSIGNED; let $source_value= (1 << 30); let $target_value= (1 << 8) - 1; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= INT; let $target_type= SMALLINT; let $source_value= 1; let $target_value= 1; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= INT; let $target_type= MEDIUMINT; let $source_value= 1; let $target_value= 1; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= INT; let $target_type= INT; let $source_value= 1; let $target_value= 1; let $can_convert = 1; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= INT; let $target_type= BIGINT; let $source_value= 1; let $target_value= 1; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= BIGINT; let $target_type= TINYINT; let $source_value= 1; let $target_value= 1; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= BIGINT; let $target_type= SMALLINT; let $source_value= 1; let $target_value= 1; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= BIGINT; let $target_type= MEDIUMINT; let $source_value= 1; let $target_value= 1; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= BIGINT; let $target_type= INT; let $source_value= 1; let $target_value= 1; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= BIGINT; let $target_type= BIGINT; let $source_value= 1; let $target_value= 1; let $can_convert = 1; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= CHAR(20); let $target_type= CHAR(20); let $source_value= 'Smoothnoodlemaps'; let $target_value= 'Smoothnoodlemaps'; let $can_convert = 1; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= CHAR(20); let $target_type= CHAR(30); let $source_value= 'Smoothnoodlemaps'; let $target_value= 'Smoothnoodlemaps'; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= CHAR(20); let $target_type= CHAR(10); let $source_value= 'Smoothnoodlemaps'; let $target_value= 'Smoothnood'; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= CHAR(20); let $target_type= VARCHAR(20); let $source_value= 'Smoothnoodlemaps'; let $target_value= 'Smoothnoodlemaps'; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= CHAR(20); let $target_type= VARCHAR(30); let $source_value= 'Smoothnoodlemaps'; let $target_value= 'Smoothnoodlemaps'; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= CHAR(20); let $target_type= VARCHAR(10); let $source_value= 'Smoothnoodlemaps'; let $target_value= 'Smoothnood'; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= CHAR(20); let $target_type= TINYTEXT; let $source_value= 'Smoothnoodlemaps'; let $target_value= 'Smoothnoodlemaps'; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= CHAR(20); let $target_type= TEXT; let $source_value= 'Smoothnoodlemaps'; let $target_value= 'Smoothnoodlemaps'; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= CHAR(20); let $target_type= MEDIUMTEXT; let $source_value= 'Smoothnoodlemaps'; let $target_value= 'Smoothnoodlemaps'; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= CHAR(20); let $target_type= LONGTEXT; let $source_value= 'Smoothnoodlemaps'; let $target_value= 'Smoothnoodlemaps'; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= VARCHAR(20); let $target_type= VARCHAR(20); let $source_value= 'Smoothnoodlemaps'; let $target_value= 'Smoothnoodlemaps'; let $can_convert = 1; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= VARCHAR(20); let $target_type= VARCHAR(30); let $source_value= 'Smoothnoodlemaps'; let $target_value= 'Smoothnoodlemaps'; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= VARCHAR(20); let $target_type= VARCHAR(10); let $source_value= 'Smoothnoodlemaps'; let $target_value= 'Smoothnood'; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= VARCHAR(20); let $target_type= CHAR(30); let $source_value= 'Smoothnoodlemaps'; let $target_value= 'Smoothnoodlemaps'; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= VARCHAR(20); let $target_type= CHAR(10); let $source_value= 'Smoothnoodlemaps'; let $target_value= 'Smoothnood'; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= VARCHAR(20); let $target_type= TINYTEXT; let $source_value= 'Smoothnoodlemaps'; let $target_value= 'Smoothnoodlemaps'; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= VARCHAR(20); let $target_type= TEXT; let $source_value= 'Smoothnoodlemaps'; let $target_value= 'Smoothnoodlemaps'; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= VARCHAR(20); let $target_type= MEDIUMTEXT; let $source_value= 'Smoothnoodlemaps'; let $target_value= 'Smoothnoodlemaps'; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= VARCHAR(20); let $target_type= LONGTEXT; let $source_value= 'Smoothnoodlemaps'; let $target_value= 'Smoothnoodlemaps'; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $blob = `select repeat('abcd', 125)`; let $truncated_blob = `select left('$blob', 255)`; @@ -604,49 +604,49 @@ let $target_type= VARCHAR(500); let $source_value= '$blob'; let $target_value= '$blob'; let $can_convert = 1; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= VARCHAR(500); let $target_type= VARCHAR(510); let $source_value= '$blob'; let $target_value= '$blob'; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= VARCHAR(500); let $target_type= VARCHAR(255); let $source_value= '$blob'; let $target_value= '$truncated_blob'; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= VARCHAR(500); let $target_type= TINYTEXT; let $source_value= '$blob'; let $target_value= '$truncated_blob'; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= VARCHAR(500); let $target_type= TEXT; let $source_value= '$blob'; let $target_value= '$blob'; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= VARCHAR(500); let $target_type= MEDIUMTEXT; let $source_value= '$blob'; let $target_value= '$blob'; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= VARCHAR(500); let $target_type= LONGTEXT; let $source_value= '$blob'; let $target_value= '$blob'; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $tiny_blob = `select repeat('tiny blob ', 25)`; let $truncated_tiny_blob = `select left('$tiny_blob', 254)`; @@ -656,224 +656,224 @@ let $target_type= VARCHAR(500); let $source_value= '$tiny_blob'; let $target_value= '$tiny_blob'; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= TEXT; let $target_type= VARCHAR(500); let $source_value= '$blob'; let $target_value= '$blob'; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= MEDIUMTEXT; let $target_type= VARCHAR(500); let $source_value= '$blob'; let $target_value= '$blob'; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= LONGTEXT; let $target_type= VARCHAR(500); let $source_value= '$blob'; let $target_value= '$blob'; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= TINYTEXT; let $target_type= CHAR(255); let $source_value= '$tiny_blob'; let $target_value= '$tiny_blob'; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= TINYTEXT; let $target_type= CHAR(250); let $source_value= '$tiny_blob'; let $target_value= left('$tiny_blob', 250); let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= TEXT; let $target_type= CHAR(255); let $source_value= '$blob'; let $target_value= left('$blob', 255); let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= MEDIUMTEXT; let $target_type= CHAR(255); let $source_value= '$blob'; let $target_value= left('$blob', 255); let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= LONGTEXT; let $target_type= CHAR(255); let $source_value= '$blob'; let $target_value= left('$blob', 255); let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= TINYTEXT; let $target_type= TINYTEXT; let $source_value= '$tiny_blob'; let $target_value= '$tiny_blob'; let $can_convert = 1; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= TINYTEXT; let $target_type= TEXT; let $source_value= '$tiny_blob'; let $target_value= '$tiny_blob'; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= TEXT; let $target_type= TINYTEXT; let $source_value= '$blob'; let $target_value= left('$blob',255); let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= DECIMAL(10,5); let $target_type= DECIMAL(10,5); let $source_value= 3.14159; let $target_value= 3.14159; let $can_convert = 1; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= DECIMAL(10,5); let $target_type= DECIMAL(10,6); let $source_value= 3.14159; let $target_value= 3.141590; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= DECIMAL(10,5); let $target_type= DECIMAL(11,5); let $source_value= 3.14159; let $target_value= 3.14159; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= DECIMAL(10,5); let $target_type= DECIMAL(11,6); let $source_value= 3.14159; let $target_value= 3.141590; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= DECIMAL(10,5); let $target_type= DECIMAL(10,4); let $source_value= 3.14159; let $target_value= 3.1416; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= DECIMAL(10,5); let $target_type= DECIMAL(9,5); let $source_value= 3.14159; let $target_value= 3.14159; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= DECIMAL(10,5); let $target_type= DECIMAL(9,4); let $source_value= 3.14159; let $target_value= 3.1416; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= FLOAT; let $target_type= DECIMAL(10,5); let $source_value= 3.15625; let $target_value= 3.15625; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= DOUBLE; let $target_type= DECIMAL(10,5); let $source_value= 3.15625; let $target_value= 3.15625; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= DECIMAL(10,5); let $target_type= FLOAT; let $source_value= 3.15625; let $target_value= 3.15625; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= DECIMAL(10,5); let $target_type= DOUBLE; let $source_value= 3.15625; let $target_value= 3.15625; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= FLOAT; let $target_type= FLOAT; let $source_value= 3.15625; let $target_value= 3.15625; let $can_convert = 1; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= DOUBLE; let $target_type= DOUBLE; let $source_value= 3.15625; let $target_value= 3.15625; let $can_convert = 1; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= FLOAT; let $target_type= DOUBLE; let $source_value= 3.15625; let $target_value= 3.15625; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= DOUBLE; let $target_type= FLOAT; let $source_value= 3.15625; let $target_value= 3.15625; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= BIT(5); let $target_type= BIT(5); let $source_value= b'11001'; let $target_value= b'11001'; let $can_convert = 1; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= BIT(5); let $target_type= BIT(6); let $source_value= b'11001'; let $target_value= b'11001'; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= BIT(6); let $target_type= BIT(5); let $source_value= b'111001'; let $target_value= b'11111'; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= BIT(5); let $target_type= BIT(12); let $source_value= b'11001'; let $target_value= b'11001'; let $can_convert = $if_is_non_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; let $source_type= BIT(12); let $target_type= BIT(5); let $source_value= b'101100111000'; let $target_value= b'11111'; let $can_convert = $if_is_lossy; -source extra/rpl_tests/check_type.inc; +source suite/rpl/include/check_type.inc; --source include/rpl_reset.inc diff --git a/mysql-test/suite/rpl/t/rpl_EE_err.test b/mysql-test/suite/rpl/t/rpl_EE_err.test index 28c5af0a192..b2ca3aacb58 100644 --- a/mysql-test/suite/rpl/t/rpl_EE_err.test +++ b/mysql-test/suite/rpl/t/rpl_EE_err.test @@ -1,2 +1,2 @@ let $engine_type=myisam; --- source extra/rpl_tests/rpl_EE_err.test +-- source include/rpl_EE_err.test diff --git a/mysql-test/suite/rpl/t/rpl_auto_increment.test b/mysql-test/suite/rpl/t/rpl_auto_increment.test index fe0f1689471..6d01fdb8796 100644 --- a/mysql-test/suite/rpl/t/rpl_auto_increment.test +++ b/mysql-test/suite/rpl/t/rpl_auto_increment.test @@ -4,4 +4,4 @@ -- source include/have_innodb.inc let $engine_type=innodb; let $engine_type2=myisam; --- source extra/rpl_tests/rpl_auto_increment.test +-- source include/rpl_auto_increment.test diff --git a/mysql-test/suite/rpl/t/rpl_auto_increment_update_failure.test b/mysql-test/suite/rpl/t/rpl_auto_increment_update_failure.test index b5eb3c5408a..82db8f08c90 100644 --- a/mysql-test/suite/rpl/t/rpl_auto_increment_update_failure.test +++ b/mysql-test/suite/rpl/t/rpl_auto_increment_update_failure.test @@ -21,43 +21,43 @@ source include/master-slave.inc; --echo # Test case1: INVOKES A TRIGGER with after insert action let $trigger_action = after insert; -source extra/rpl_tests/rpl_auto_increment_invoke_trigger.test; +source include/rpl_auto_increment_invoke_trigger.test; --echo # Test case2: INVOKES A TRIGGER with before insert action let $trigger_action = before insert; -source extra/rpl_tests/rpl_auto_increment_invoke_trigger.test; +source include/rpl_auto_increment_invoke_trigger.test; --echo # Test case3: INVOKES A TRIGGER with after update action let $trigger_action = after update; -source extra/rpl_tests/rpl_auto_increment_invoke_trigger.test; +source include/rpl_auto_increment_invoke_trigger.test; --echo # Test case4: INVOKES A TRIGGER with before update action let $trigger_action = before update; -source extra/rpl_tests/rpl_auto_increment_invoke_trigger.test; +source include/rpl_auto_increment_invoke_trigger.test; --echo # Test case5: INVOKES A TRIGGER with after delete action let $trigger_action = after delete; -source extra/rpl_tests/rpl_auto_increment_invoke_trigger.test; +source include/rpl_auto_increment_invoke_trigger.test; --echo # Test case6: INVOKES A TRIGGER with before delete action let $trigger_action = before delete; -source extra/rpl_tests/rpl_auto_increment_invoke_trigger.test; +source include/rpl_auto_increment_invoke_trigger.test; --echo # Test case7: CALLS A FUNCTION which INVOKES A TRIGGER with after insert action let $insert_action = after insert; -source extra/rpl_tests/rpl_autoinc_func_invokes_trigger.test; +source include/rpl_autoinc_func_invokes_trigger.test; --echo # Test case8: CALLS A FUNCTION which INVOKES A TRIGGER with before insert action let $insert_action = before insert; -source extra/rpl_tests/rpl_autoinc_func_invokes_trigger.test; +source include/rpl_autoinc_func_invokes_trigger.test; --echo # Test case9: INSERT DATA INTO VIEW WHICH INVOKES TRIGGERS with after insert action let $insert_action = after insert; -source extra/rpl_tests/rpl_auto_increment_insert_view.test; +source include/rpl_auto_increment_insert_view.test; --echo # Test case10: INSERT DATA INTO VIEW WHICH INVOKES TRIGGERS with before insert action let $insert_action = before insert; -source extra/rpl_tests/rpl_auto_increment_insert_view.test; +source include/rpl_auto_increment_insert_view.test; --echo # Test case11: INVOKES A FUNCTION TO INSERT TWO OR MORE VALUES INTO A TABLE WITH AUTOINC COLUMN connection master; diff --git a/mysql-test/suite/rpl/t/rpl_binlog_errors.test b/mysql-test/suite/rpl/t/rpl_binlog_errors.test index 6a2cf20d756..30faaf79613 100644 --- a/mysql-test/suite/rpl/t/rpl_binlog_errors.test +++ b/mysql-test/suite/rpl/t/rpl_binlog_errors.test @@ -1 +1 @@ ---source extra/rpl_tests/rpl_binlog_errors.inc +--source include/rpl_binlog_errors.inc diff --git a/mysql-test/suite/rpl/t/rpl_blackhole.test b/mysql-test/suite/rpl/t/rpl_blackhole.test index 76b2e2421c9..120f11f58ea 100644 --- a/mysql-test/suite/rpl/t/rpl_blackhole.test +++ b/mysql-test/suite/rpl/t/rpl_blackhole.test @@ -33,19 +33,19 @@ sync_slave_with_master; # Test insert, no primary key let $statement = INSERT INTO t1 VALUES (1,1,1),(2,1,2),(3,1,3),(4,1,4); -source extra/rpl_tests/rpl_blackhole.test; +source include/rpl_blackhole.test; # Test update, no primary key let $statement = UPDATE t1 SET c = 2*c WHERE a % 2 = 0 AND b = 1; -source extra/rpl_tests/rpl_blackhole.test; +source include/rpl_blackhole.test; # Test delete, no primary key let $statement = DELETE FROM t1 WHERE a % 2 = 0 AND b = 1; -source extra/rpl_tests/rpl_blackhole.test; +source include/rpl_blackhole.test; # Test INSERT-SELECT into Blackhole, no primary key let $statement = INSERT INTO t1 SELECT * FROM t2; -source extra/rpl_tests/rpl_blackhole.test; +source include/rpl_blackhole.test; # # The MASTER has MyISAM as the engine for both tables. The SLAVE has Blackhole @@ -62,7 +62,7 @@ source extra/rpl_tests/rpl_blackhole.test; # # Test INSERT-SELECT from Blackhole, no primary key # let $statement = INSERT INTO t2 SELECT * FROM t1; -# source extra/rpl_tests/rpl_blackhole.test; +# source include/rpl_blackhole.test; # connection master; @@ -70,30 +70,30 @@ ALTER TABLE t1 ADD PRIMARY KEY pk_t1 (a,b); # Test insert, primary key let $statement = INSERT INTO t1 VALUES (1,2,1),(2,2,2),(3,2,3),(4,2,4); -source extra/rpl_tests/rpl_blackhole.test; +source include/rpl_blackhole.test; # Test update, primary key let $statement = UPDATE t1 SET c = 2*c WHERE a % 2 = 0 AND b = 2; -source extra/rpl_tests/rpl_blackhole.test; +source include/rpl_blackhole.test; # Test delete, primary key let $statement = DELETE FROM t1 WHERE a % 2 = 0 AND b = 2; -source extra/rpl_tests/rpl_blackhole.test; +source include/rpl_blackhole.test; connection master; ALTER TABLE t1 DROP PRIMARY KEY, ADD KEY key_t1 (a); # Test insert, key let $statement = INSERT INTO t1 VALUES (1,3,1),(2,3,2),(3,3,3),(4,3,4); -source extra/rpl_tests/rpl_blackhole.test; +source include/rpl_blackhole.test; # Test update, key let $statement = UPDATE t1 SET c = 2*c WHERE a % 2 = 0 AND b = 3; -source extra/rpl_tests/rpl_blackhole.test; +source include/rpl_blackhole.test; # Test delete, key let $statement = DELETE FROM t1 WHERE a % 2 = 0 AND b = 3; -source extra/rpl_tests/rpl_blackhole.test; +source include/rpl_blackhole.test; connection master; DROP TABLE t1,t2; diff --git a/mysql-test/suite/rpl/t/rpl_cant_read_event_incident.test b/mysql-test/suite/rpl/t/rpl_cant_read_event_incident.test index 6d222cba115..573c1d111fc 100644 --- a/mysql-test/suite/rpl/t/rpl_cant_read_event_incident.test +++ b/mysql-test/suite/rpl/t/rpl_cant_read_event_incident.test @@ -1 +1 @@ ---source extra/rpl_tests/rpl_cant_read_event_incident.inc +--source include/rpl_cant_read_event_incident.inc diff --git a/mysql-test/suite/rpl/t/rpl_charset.test b/mysql-test/suite/rpl/t/rpl_charset.test index 3ed9147508e..31ea2bc8f07 100644 --- a/mysql-test/suite/rpl/t/rpl_charset.test +++ b/mysql-test/suite/rpl/t/rpl_charset.test @@ -1,2 +1,2 @@ let $engine_type=myisam; -source extra/rpl_tests/rpl_charset.test; +source include/rpl_charset.test; diff --git a/mysql-test/suite/rpl/t/rpl_checksum.test b/mysql-test/suite/rpl/t/rpl_checksum.test index 8e006b1b6a0..0edf8fda7f3 100644 --- a/mysql-test/suite/rpl/t/rpl_checksum.test +++ b/mysql-test/suite/rpl/t/rpl_checksum.test @@ -1 +1 @@ ---source extra/rpl_tests/rpl_checksum.inc +--source include/rpl_checksum.inc diff --git a/mysql-test/suite/rpl/t/rpl_checksum_cache.test b/mysql-test/suite/rpl/t/rpl_checksum_cache.test index 56c3e1e1cb5..59b338d2556 100644 --- a/mysql-test/suite/rpl/t/rpl_checksum_cache.test +++ b/mysql-test/suite/rpl/t/rpl_checksum_cache.test @@ -1 +1 @@ ---source extra/rpl_tests/rpl_checksum_cache.inc +--source include/rpl_checksum_cache.inc diff --git a/mysql-test/suite/rpl/t/rpl_commit_after_flush.test b/mysql-test/suite/rpl/t/rpl_commit_after_flush.test index 1e2ca875190..5d54790827c 100644 --- a/mysql-test/suite/rpl/t/rpl_commit_after_flush.test +++ b/mysql-test/suite/rpl/t/rpl_commit_after_flush.test @@ -1,5 +1,5 @@ -- source include/have_innodb.inc -- source include/master-slave.inc let $engine_type=innodb; --- source extra/rpl_tests/rpl_commit_after_flush.test +-- source include/rpl_commit_after_flush.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_corruption.test b/mysql-test/suite/rpl/t/rpl_corruption.test index 310b0cef8e8..e51d1c65e95 100644 --- a/mysql-test/suite/rpl/t/rpl_corruption.test +++ b/mysql-test/suite/rpl/t/rpl_corruption.test @@ -1 +1 @@ ---source extra/rpl_tests/rpl_corruption.inc +--source include/rpl_corruption.inc diff --git a/mysql-test/suite/rpl/t/rpl_ddl.test b/mysql-test/suite/rpl/t/rpl_ddl.test index 2045ec97edd..b11a6927f09 100644 --- a/mysql-test/suite/rpl/t/rpl_ddl.test +++ b/mysql-test/suite/rpl/t/rpl_ddl.test @@ -28,5 +28,5 @@ let $engine_type= InnoDB; let $temp_engine_type= MEMORY; let $show_binlog = 0; let $manipulate = 0; --- source extra/rpl_tests/rpl_ddl.test +-- source include/rpl_ddl.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_deadlock_innodb.test b/mysql-test/suite/rpl/t/rpl_deadlock_innodb.test index ade915da105..e2311cb06b5 100644 --- a/mysql-test/suite/rpl/t/rpl_deadlock_innodb.test +++ b/mysql-test/suite/rpl/t/rpl_deadlock_innodb.test @@ -1,4 +1,4 @@ -- source include/have_innodb.inc -- source include/long_test.inc let $engine_type=innodb; --- source extra/rpl_tests/rpl_deadlock.test +-- source include/rpl_deadlock.test diff --git a/mysql-test/suite/rpl/t/rpl_delayed_slave.test b/mysql-test/suite/rpl/t/rpl_delayed_slave.test index 2400a821e2b..7dd7b9cf6d9 100644 --- a/mysql-test/suite/rpl/t/rpl_delayed_slave.test +++ b/mysql-test/suite/rpl/t/rpl_delayed_slave.test @@ -109,7 +109,7 @@ eval CHANGE MASTER TO MASTER_DELAY = $time2; INSERT INTO t1 VALUES ('normal setup', 1); --let $query_number= 1 ---source extra/rpl_tests/delayed_slave_wait_on_query.inc +--source include/delayed_slave_wait_on_query.inc --echo ==== Slave lags "naturally" after master ==== @@ -258,7 +258,7 @@ INSERT INTO t1 VALUES ('stop slave and start slave: DML', 7); --source include/rpl_assert.inc --let $query_number= 7 ---source extra/rpl_tests/delayed_slave_wait_on_query.inc +--source include/delayed_slave_wait_on_query.inc --echo ==== STOP SLAVE / START SLAVE + DDL ==== diff --git a/mysql-test/suite/rpl/t/rpl_delete_no_where.test b/mysql-test/suite/rpl/t/rpl_delete_no_where.test index 9ab637063e0..c07649cb49a 100644 --- a/mysql-test/suite/rpl/t/rpl_delete_no_where.test +++ b/mysql-test/suite/rpl/t/rpl_delete_no_where.test @@ -1,4 +1,4 @@ -- source include/master-slave.inc let $engine_type=myisam; --- source extra/rpl_tests/rpl_delete_no_where.test +-- source include/rpl_delete_no_where.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_extra_col_master_innodb.test b/mysql-test/suite/rpl/t/rpl_extra_col_master_innodb.test index 201392346be..63ae0fce9ba 100644 --- a/mysql-test/suite/rpl/t/rpl_extra_col_master_innodb.test +++ b/mysql-test/suite/rpl/t/rpl_extra_col_master_innodb.test @@ -6,6 +6,6 @@ -- source include/master-slave.inc let $engine_type = 'InnoDB'; ---source extra/rpl_tests/rpl_extra_col_master.test +--source include/rpl_extra_col_master.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_extra_col_master_myisam.test b/mysql-test/suite/rpl/t/rpl_extra_col_master_myisam.test index 4f344cfaca9..72a35992fe5 100644 --- a/mysql-test/suite/rpl/t/rpl_extra_col_master_myisam.test +++ b/mysql-test/suite/rpl/t/rpl_extra_col_master_myisam.test @@ -5,6 +5,6 @@ -- source include/master-slave.inc let $engine_type = 'MyISAM'; ---source extra/rpl_tests/rpl_extra_col_master.test +--source include/rpl_extra_col_master.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_extra_col_slave_innodb.test b/mysql-test/suite/rpl/t/rpl_extra_col_slave_innodb.test index f4b04468273..e16e1dba408 100644 --- a/mysql-test/suite/rpl/t/rpl_extra_col_slave_innodb.test +++ b/mysql-test/suite/rpl/t/rpl_extra_col_slave_innodb.test @@ -3,5 +3,5 @@ -- source include/master-slave.inc let $engine_type = 'InnoDB'; --- source extra/rpl_tests/rpl_extra_col_slave.test +-- source include/rpl_extra_col_slave.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_extra_col_slave_myisam.test b/mysql-test/suite/rpl/t/rpl_extra_col_slave_myisam.test index d8d64aed566..f1e9fa242cc 100644 --- a/mysql-test/suite/rpl/t/rpl_extra_col_slave_myisam.test +++ b/mysql-test/suite/rpl/t/rpl_extra_col_slave_myisam.test @@ -2,5 +2,5 @@ -- source include/master-slave.inc let $engine_type = 'MyISAM'; --- source extra/rpl_tests/rpl_extra_col_slave.test +-- source include/rpl_extra_col_slave.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_failed_optimize.test b/mysql-test/suite/rpl/t/rpl_failed_optimize.test index 99860f16966..a65c19cb38c 100644 --- a/mysql-test/suite/rpl/t/rpl_failed_optimize.test +++ b/mysql-test/suite/rpl/t/rpl_failed_optimize.test @@ -1,3 +1,3 @@ -- source include/have_innodb.inc let $engine_type=InnoDB; --- source extra/rpl_tests/rpl_failed_optimize.test +-- source include/rpl_failed_optimize.test diff --git a/mysql-test/suite/rpl/t/rpl_foreign_key_innodb.test b/mysql-test/suite/rpl/t/rpl_foreign_key_innodb.test index ed28c2e9d1c..489e90f9eb5 100644 --- a/mysql-test/suite/rpl/t/rpl_foreign_key_innodb.test +++ b/mysql-test/suite/rpl/t/rpl_foreign_key_innodb.test @@ -1,3 +1,3 @@ -- source include/have_innodb.inc let $engine_type=INNODB; --- source extra/rpl_tests/rpl_foreign_key.test +-- source include/rpl_foreign_key.test diff --git a/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test b/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test index dca32c30a94..9c4cc1bc34d 100644 --- a/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test +++ b/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test @@ -6,7 +6,7 @@ # The COLLATION_SERVER and TIME_ZONE are got only on master server version 4. # So they can't be verified by test case here. # Finish the following tests by calling its common test script: -# extra/rpl_tests/rpl_get_master_version_and_clock.test. +# include/rpl_get_master_version_and_clock.test. source include/have_debug.inc; source include/have_debug_sync.inc; @@ -28,17 +28,17 @@ call mtr.add_suppression("Slave I/O thread .* register on master"); #Test case 1: Try to get the value of the UNIX_TIMESTAMP from master under network disconnection let $debug_saved= `select @@global.debug`; -# set up two parameters to pass into extra/rpl_tests/rpl_get_master_version_and_clock +# set up two parameters to pass into include/rpl_get_master_version_and_clock let $dbug_sync_point= 'debug_lock.before_get_UNIX_TIMESTAMP'; let $debug_sync_action= 'now SIGNAL signal.get_unix_timestamp'; -source extra/rpl_tests/rpl_get_master_version_and_clock.test; +source include/rpl_get_master_version_and_clock.test; #Test case 2: Try to get the value of the SERVER_ID from master under network disconnection connection slave; let $dbug_sync_point= 'debug_lock.before_get_SERVER_ID'; let $debug_sync_action= 'now SIGNAL signal.get_server_id'; -source extra/rpl_tests/rpl_get_master_version_and_clock.test; +source include/rpl_get_master_version_and_clock.test; eval set global debug_dbug= '$debug_saved'; diff --git a/mysql-test/suite/rpl/t/rpl_gtid_basic.test b/mysql-test/suite/rpl/t/rpl_gtid_basic.test index e14bf89425d..004003ea524 100644 --- a/mysql-test/suite/rpl/t/rpl_gtid_basic.test +++ b/mysql-test/suite/rpl/t/rpl_gtid_basic.test @@ -1,4 +1,4 @@ ---source extra/rpl_tests/rpl_gtid_basic.inc +--source include/rpl_gtid_basic.inc --echo # --echo # Start of 10.2 tests diff --git a/mysql-test/suite/rpl/t/rpl_incident.test b/mysql-test/suite/rpl/t/rpl_incident.test index 9be855e1a8b..4bb6477ca98 100644 --- a/mysql-test/suite/rpl/t/rpl_incident.test +++ b/mysql-test/suite/rpl/t/rpl_incident.test @@ -1 +1 @@ ---source extra/rpl_tests/rpl_incident.inc +--source include/rpl_incident.inc diff --git a/mysql-test/suite/rpl/t/rpl_init_slave_errors.test b/mysql-test/suite/rpl/t/rpl_init_slave_errors.test index 6f515b9390a..6f6ab7e8d7c 100644 --- a/mysql-test/suite/rpl/t/rpl_init_slave_errors.test +++ b/mysql-test/suite/rpl/t/rpl_init_slave_errors.test @@ -1 +1 @@ ---source extra/rpl_tests/rpl_init_slave_errors.inc +--source include/rpl_init_slave_errors.inc diff --git a/mysql-test/suite/rpl/t/rpl_insert_delayed.test b/mysql-test/suite/rpl/t/rpl_insert_delayed.test index 342b9115de8..6a88899fec3 100644 --- a/mysql-test/suite/rpl/t/rpl_insert_delayed.test +++ b/mysql-test/suite/rpl/t/rpl_insert_delayed.test @@ -1,5 +1,5 @@ --source include/not_embedded.inc --source include/not_windows.inc --source include/master-slave.inc ---source extra/rpl_tests/rpl_insert_delayed.test +--source include/rpl_insert_delayed.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_insert_id.test b/mysql-test/suite/rpl/t/rpl_insert_id.test index ad32ad24b33..c9d84049ff6 100644 --- a/mysql-test/suite/rpl/t/rpl_insert_id.test +++ b/mysql-test/suite/rpl/t/rpl_insert_id.test @@ -3,4 +3,4 @@ ################################# -- source include/have_innodb.inc let $engine_type=myisam; --- source extra/rpl_tests/rpl_insert_id.test +-- source include/rpl_insert_id.test diff --git a/mysql-test/suite/rpl/t/rpl_insert_id_pk.test b/mysql-test/suite/rpl/t/rpl_insert_id_pk.test index 148afdac87b..d9ba2a2bdcc 100644 --- a/mysql-test/suite/rpl/t/rpl_insert_id_pk.test +++ b/mysql-test/suite/rpl/t/rpl_insert_id_pk.test @@ -3,4 +3,4 @@ ################################# -- source include/have_innodb.inc let $engine_type=innodb; --- source extra/rpl_tests/rpl_insert_id_pk.test +-- source include/rpl_insert_id_pk.test diff --git a/mysql-test/suite/rpl/t/rpl_insert_ignore.test b/mysql-test/suite/rpl/t/rpl_insert_ignore.test index 0891a04db25..2940ad16bf2 100644 --- a/mysql-test/suite/rpl/t/rpl_insert_ignore.test +++ b/mysql-test/suite/rpl/t/rpl_insert_ignore.test @@ -7,9 +7,9 @@ call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); -- let $engine_type=innodb --- source extra/rpl_tests/rpl_insert_ignore.test +-- source include/rpl_insert_ignore.test -- let $engine_type=myisam --- source extra/rpl_tests/rpl_insert_ignore.test +-- source include/rpl_insert_ignore.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_loaddata.test b/mysql-test/suite/rpl/t/rpl_loaddata.test index 76b008caa92..9f0ba95a03f 100644 --- a/mysql-test/suite/rpl/t/rpl_loaddata.test +++ b/mysql-test/suite/rpl/t/rpl_loaddata.test @@ -1,4 +1,4 @@ -- source include/have_binlog_format_statement.inc let $engine_type=MyISAM; --- source extra/rpl_tests/rpl_loaddata.test +-- source include/rpl_loaddata.test diff --git a/mysql-test/suite/rpl/t/rpl_loaddatalocal.test b/mysql-test/suite/rpl/t/rpl_loaddatalocal.test index 8d90afaed27..712041467ab 100644 --- a/mysql-test/suite/rpl/t/rpl_loaddatalocal.test +++ b/mysql-test/suite/rpl/t/rpl_loaddatalocal.test @@ -1 +1 @@ ---source extra/rpl_tests/rpl_loaddata_local.inc +--source include/rpl_loaddata_local.inc diff --git a/mysql-test/suite/rpl/t/rpl_loadfile.test b/mysql-test/suite/rpl/t/rpl_loadfile.test index babf4208b3d..10fecf1f653 100644 --- a/mysql-test/suite/rpl/t/rpl_loadfile.test +++ b/mysql-test/suite/rpl/t/rpl_loadfile.test @@ -1 +1 @@ ---source extra/rpl_tests/rpl_loadfile.inc +--source include/rpl_loadfile.inc diff --git a/mysql-test/suite/rpl/t/rpl_mixed_binlog_max_cache_size.test b/mysql-test/suite/rpl/t/rpl_mixed_binlog_max_cache_size.test index 81b01cc9140..c4c89d9048b 100644 --- a/mysql-test/suite/rpl/t/rpl_mixed_binlog_max_cache_size.test +++ b/mysql-test/suite/rpl/t/rpl_mixed_binlog_max_cache_size.test @@ -4,5 +4,5 @@ --source include/have_binlog_format_mixed.inc --source include/master-slave.inc ---source extra/rpl_tests/rpl_binlog_max_cache_size.test +--source include/rpl_binlog_max_cache_size.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_mixed_drop_create_temp_table.test b/mysql-test/suite/rpl/t/rpl_mixed_drop_create_temp_table.test index d3412c3cd52..e707bb9973b 100644 --- a/mysql-test/suite/rpl/t/rpl_mixed_drop_create_temp_table.test +++ b/mysql-test/suite/rpl/t/rpl_mixed_drop_create_temp_table.test @@ -8,5 +8,5 @@ --source include/have_innodb.inc --source include/master-slave.inc ---source extra/rpl_tests/rpl_drop_create_temp_table.test +--source include/rpl_drop_create_temp_table.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_mixed_implicit_commit_binlog.test b/mysql-test/suite/rpl/t/rpl_mixed_implicit_commit_binlog.test index fa948f8f5fe..e3dc6cbaa73 100644 --- a/mysql-test/suite/rpl/t/rpl_mixed_implicit_commit_binlog.test +++ b/mysql-test/suite/rpl/t/rpl_mixed_implicit_commit_binlog.test @@ -1,5 +1,5 @@ ################################################################################ -# Check file extra/rpl_tests/rpl_implicit_commit_binlog.test +# Check file include/rpl_implicit_commit_binlog.test ################################################################################ --source include/have_udf.inc --source include/have_binlog_format_mixed.inc @@ -8,5 +8,5 @@ --let $engine=Innodb set session storage_engine=innodb; ---source extra/rpl_tests/rpl_implicit_commit_binlog.test +--source include/rpl_implicit_commit_binlog.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_mixed_mixing_engines.test b/mysql-test/suite/rpl/t/rpl_mixed_mixing_engines.test index a9c8f6fe3e1..1df53270b74 100644 --- a/mysql-test/suite/rpl/t/rpl_mixed_mixing_engines.test +++ b/mysql-test/suite/rpl/t/rpl_mixed_mixing_engines.test @@ -8,5 +8,5 @@ let $engine_type=Innodb; let $database_name=test; ---source extra/rpl_tests/rpl_mixing_engines.test +--source include/rpl_mixing_engines.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_multi_update.test b/mysql-test/suite/rpl/t/rpl_multi_update.test index cc147eb3263..3927ed698e6 100644 --- a/mysql-test/suite/rpl/t/rpl_multi_update.test +++ b/mysql-test/suite/rpl/t/rpl_multi_update.test @@ -1,2 +1,2 @@ let $engine_type=MyISAM; --- source extra/rpl_tests/rpl_multi_update.test +-- source include/rpl_multi_update.test diff --git a/mysql-test/suite/rpl/t/rpl_multi_update2.test b/mysql-test/suite/rpl/t/rpl_multi_update2.test index 95952cd9e15..d2368f2016b 100644 --- a/mysql-test/suite/rpl/t/rpl_multi_update2.test +++ b/mysql-test/suite/rpl/t/rpl_multi_update2.test @@ -5,5 +5,5 @@ --source include/master-slave.inc call mtr.add_suppression('Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT'); let $engine_type=MyISAM; ---source extra/rpl_tests/rpl_multi_update2.test +--source include/rpl_multi_update2.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_multi_update3.test b/mysql-test/suite/rpl/t/rpl_multi_update3.test index d356ca88517..0a15e9aa229 100644 --- a/mysql-test/suite/rpl/t/rpl_multi_update3.test +++ b/mysql-test/suite/rpl/t/rpl_multi_update3.test @@ -5,5 +5,5 @@ --source include/master-slave.inc call mtr.add_suppression('Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT.'); let $engine_type=MyISAM; --- source extra/rpl_tests/rpl_multi_update3.test +-- source include/rpl_multi_update3.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test b/mysql-test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test index 93ec9acf5ea..1f2f8749a0c 100644 --- a/mysql-test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test +++ b/mysql-test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test @@ -11,5 +11,5 @@ SET SESSION binlog_direct_non_transactional_updates = OFF; --enable_query_log let $engine_type=Innodb; let $database_name=test; ---source extra/rpl_tests/rpl_mixing_engines.test +--source include/rpl_mixing_engines.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_non_direct_row_mixing_engines.test b/mysql-test/suite/rpl/t/rpl_non_direct_row_mixing_engines.test index 50577a1849c..b4552c79349 100644 --- a/mysql-test/suite/rpl/t/rpl_non_direct_row_mixing_engines.test +++ b/mysql-test/suite/rpl/t/rpl_non_direct_row_mixing_engines.test @@ -11,7 +11,7 @@ SET SESSION binlog_direct_non_transactional_updates = OFF; --enable_query_log let $engine_type=Innodb; let $database_name=test; ---source extra/rpl_tests/rpl_mixing_engines.test +--source include/rpl_mixing_engines.test --diff_files suite/rpl/r/rpl_non_direct_row_mixing_engines.result suite/rpl/r/rpl_row_mixing_engines.result --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_non_direct_stm_mixing_engines.test b/mysql-test/suite/rpl/t/rpl_non_direct_stm_mixing_engines.test index e340eb74115..23552515df7 100644 --- a/mysql-test/suite/rpl/t/rpl_non_direct_stm_mixing_engines.test +++ b/mysql-test/suite/rpl/t/rpl_non_direct_stm_mixing_engines.test @@ -11,5 +11,5 @@ SET SESSION binlog_direct_non_transactional_updates = OFF; --enable_query_log let $engine_type=Innodb; let $database_name=test; ---source extra/rpl_tests/rpl_mixing_engines.test +--source include/rpl_mixing_engines.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_not_null_innodb.test b/mysql-test/suite/rpl/t/rpl_not_null_innodb.test index 6a1cc341060..0e67cd3600b 100644 --- a/mysql-test/suite/rpl/t/rpl_not_null_innodb.test +++ b/mysql-test/suite/rpl/t/rpl_not_null_innodb.test @@ -16,5 +16,5 @@ --source include/master-slave.inc let $engine=Innodb; ---source extra/rpl_tests/rpl_not_null.test +--source include/rpl_not_null.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_not_null_myisam.test b/mysql-test/suite/rpl/t/rpl_not_null_myisam.test index 6ef0b65d5ff..718761d6d23 100644 --- a/mysql-test/suite/rpl/t/rpl_not_null_myisam.test +++ b/mysql-test/suite/rpl/t/rpl_not_null_myisam.test @@ -15,5 +15,5 @@ --source include/master-slave.inc let $engine=MyISAM; ---source extra/rpl_tests/rpl_not_null.test +--source include/rpl_not_null.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_packet.test b/mysql-test/suite/rpl/t/rpl_packet.test index 31357cb148e..1bf99c2366b 100644 --- a/mysql-test/suite/rpl/t/rpl_packet.test +++ b/mysql-test/suite/rpl/t/rpl_packet.test @@ -1 +1 @@ ---source extra/rpl_tests/rpl_packet.inc +--source include/rpl_packet.inc diff --git a/mysql-test/suite/rpl/t/rpl_parallel.test b/mysql-test/suite/rpl/t/rpl_parallel.test index b7c4bb429a4..ee39bfa7a39 100644 --- a/mysql-test/suite/rpl/t/rpl_parallel.test +++ b/mysql-test/suite/rpl/t/rpl_parallel.test @@ -1 +1 @@ ---source extra/rpl_tests/rpl_parallel.inc +--source include/rpl_parallel.inc diff --git a/mysql-test/suite/rpl/t/rpl_parallel_show_binlog_events_purge_logs.test b/mysql-test/suite/rpl/t/rpl_parallel_show_binlog_events_purge_logs.test index 9e93b0b56e9..8c8892d5370 100644 --- a/mysql-test/suite/rpl/t/rpl_parallel_show_binlog_events_purge_logs.test +++ b/mysql-test/suite/rpl/t/rpl_parallel_show_binlog_events_purge_logs.test @@ -1 +1 @@ ---source extra/rpl_tests/rpl_parallel_show_binlog_events_purge_logs.inc +--source include/rpl_parallel_show_binlog_events_purge_logs.inc diff --git a/mysql-test/suite/rpl/t/rpl_relay_space_innodb.test b/mysql-test/suite/rpl/t/rpl_relay_space_innodb.test index 87df66bc148..ccb1424a976 100644 --- a/mysql-test/suite/rpl/t/rpl_relay_space_innodb.test +++ b/mysql-test/suite/rpl/t/rpl_relay_space_innodb.test @@ -1,3 +1,3 @@ -- source include/have_innodb.inc let $engine_type=InnoDB; --- source extra/rpl_tests/rpl_sv_relay_space.test +-- source include/rpl_sv_relay_space.test diff --git a/mysql-test/suite/rpl/t/rpl_relay_space_myisam.test b/mysql-test/suite/rpl/t/rpl_relay_space_myisam.test index e022921a5bb..6aa91dbccaa 100644 --- a/mysql-test/suite/rpl/t/rpl_relay_space_myisam.test +++ b/mysql-test/suite/rpl/t/rpl_relay_space_myisam.test @@ -1,2 +1,2 @@ let $engine_type=MyISAM; --- source extra/rpl_tests/rpl_sv_relay_space.test +-- source include/rpl_sv_relay_space.test diff --git a/mysql-test/suite/rpl/t/rpl_relayrotate.test b/mysql-test/suite/rpl/t/rpl_relayrotate.test index 5e3bcdcd711..720739e14c0 100644 --- a/mysql-test/suite/rpl/t/rpl_relayrotate.test +++ b/mysql-test/suite/rpl/t/rpl_relayrotate.test @@ -1 +1 @@ ---source extra/rpl_tests/rpl_relayrotate.inc +--source include/rpl_relayrotate.inc diff --git a/mysql-test/suite/rpl/t/rpl_row_001.test b/mysql-test/suite/rpl/t/rpl_row_001.test index 47b6da75dd6..06d01f2476e 100644 --- a/mysql-test/suite/rpl/t/rpl_row_001.test +++ b/mysql-test/suite/rpl/t/rpl_row_001.test @@ -7,5 +7,5 @@ -- source include/master-slave.inc let $engine_type=MYISAM; --- source extra/rpl_tests/rpl_row_001.test +-- source include/rpl_row_001.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_row_UUID.test b/mysql-test/suite/rpl/t/rpl_row_UUID.test index 1de44af8156..8e1aa6d20d0 100644 --- a/mysql-test/suite/rpl/t/rpl_row_UUID.test +++ b/mysql-test/suite/rpl/t/rpl_row_UUID.test @@ -4,5 +4,5 @@ -- source include/have_binlog_format_row.inc -- source include/master-slave.inc let $engine_type=myisam; ---source extra/rpl_tests/rpl_row_UUID.test +--source include/rpl_row_UUID.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_row_annotate_do.test b/mysql-test/suite/rpl/t/rpl_row_annotate_do.test index 4114f90b90b..ffaae3146f3 100644 --- a/mysql-test/suite/rpl/t/rpl_row_annotate_do.test +++ b/mysql-test/suite/rpl/t/rpl_row_annotate_do.test @@ -13,4 +13,4 @@ ############################################################################### --source include/have_binlog_format_row.inc ---source extra/rpl_tests/rpl_row_annotate.test +--source include/rpl_row_annotate.test diff --git a/mysql-test/suite/rpl/t/rpl_row_annotate_dont.test b/mysql-test/suite/rpl/t/rpl_row_annotate_dont.test index ef746e76b4d..24dd2a1c373 100644 --- a/mysql-test/suite/rpl/t/rpl_row_annotate_dont.test +++ b/mysql-test/suite/rpl/t/rpl_row_annotate_dont.test @@ -6,4 +6,4 @@ ############################################################################### --source include/have_binlog_format_row.inc ---source extra/rpl_tests/rpl_row_annotate.test +--source include/rpl_row_annotate.test diff --git a/mysql-test/suite/rpl/t/rpl_row_basic_2myisam.test b/mysql-test/suite/rpl/t/rpl_row_basic_2myisam.test index d4a1777a8dc..f1e836c64b7 100644 --- a/mysql-test/suite/rpl/t/rpl_row_basic_2myisam.test +++ b/mysql-test/suite/rpl/t/rpl_row_basic_2myisam.test @@ -3,7 +3,7 @@ let $type= 'MYISAM' ; let $extra_index= ; --- source extra/rpl_tests/rpl_row_basic.test +-- source include/rpl_row_basic.test connection slave; call mtr.add_suppression("Can't find record in 't1'"); diff --git a/mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test b/mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test index 55ea2f3c3c8..b84a4c13c80 100644 --- a/mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test +++ b/mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test @@ -6,6 +6,6 @@ connection slave; let $bit_field_special = ALL_LOSSY; let $type= 'INNODB' ; let $extra_index= ; --- source extra/rpl_tests/rpl_row_basic.test +-- source include/rpl_row_basic.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_row_binlog_max_cache_size.test b/mysql-test/suite/rpl/t/rpl_row_binlog_max_cache_size.test index cc031d382e0..a4db32cf46e 100644 --- a/mysql-test/suite/rpl/t/rpl_row_binlog_max_cache_size.test +++ b/mysql-test/suite/rpl/t/rpl_row_binlog_max_cache_size.test @@ -4,5 +4,5 @@ --source include/have_binlog_format_row.inc --source include/master-slave.inc ---source extra/rpl_tests/rpl_binlog_max_cache_size.test +--source include/rpl_binlog_max_cache_size.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_row_blob_innodb.test b/mysql-test/suite/rpl/t/rpl_row_blob_innodb.test index 5c1c705f48d..57f3e91aa10 100644 --- a/mysql-test/suite/rpl/t/rpl_row_blob_innodb.test +++ b/mysql-test/suite/rpl/t/rpl_row_blob_innodb.test @@ -8,6 +8,6 @@ -- source include/have_binlog_format_row.inc -- source include/master-slave.inc let $engine_type=InnoDB; --- source extra/rpl_tests/rpl_row_blob.test +-- source include/rpl_row_blob.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_row_blob_myisam.test b/mysql-test/suite/rpl/t/rpl_row_blob_myisam.test index e83da6ba142..246d38f486c 100644 --- a/mysql-test/suite/rpl/t/rpl_row_blob_myisam.test +++ b/mysql-test/suite/rpl/t/rpl_row_blob_myisam.test @@ -7,6 +7,6 @@ -- source include/have_binlog_format_row.inc -- source include/master-slave.inc let $engine_type=myisam; --- source extra/rpl_tests/rpl_row_blob.test +-- source include/rpl_row_blob.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_row_conflicts.test b/mysql-test/suite/rpl/t/rpl_row_conflicts.test index 9ad33a4b819..adf37d99073 100644 --- a/mysql-test/suite/rpl/t/rpl_row_conflicts.test +++ b/mysql-test/suite/rpl/t/rpl_row_conflicts.test @@ -1,4 +1,4 @@ -# See the top of mysql-test/extra/rpl_tests/rpl_conflicts.test for +# See the top of mysql-test/include/rpl_conflicts.test for # explanation of what this test does. # # This test file is for row-logging mode. It runs the test twice, with @@ -18,7 +18,7 @@ SET @old_slave_exec_mode= @@global.slave_exec_mode; --echo ######## Run with slave_exec_mode=STRICT ######## SET @@global.slave_exec_mode = 'STRICT'; -source extra/rpl_tests/rpl_conflicts.test; +source include/rpl_conflicts.test; --source include/rpl_reset.inc @@ -26,7 +26,7 @@ source extra/rpl_tests/rpl_conflicts.test; --echo ######## Run with slave_exec_mode=IDEMPOTENT ######## set @@global.slave_exec_mode= 'IDEMPOTENT'; -source extra/rpl_tests/rpl_conflicts.test; +source include/rpl_conflicts.test; SET @@global.slave_exec_mode= @old_slave_exec_mode; diff --git a/mysql-test/suite/rpl/t/rpl_row_delayed_ins.test b/mysql-test/suite/rpl/t/rpl_row_delayed_ins.test index b898a9a120a..603af39834c 100644 --- a/mysql-test/suite/rpl/t/rpl_row_delayed_ins.test +++ b/mysql-test/suite/rpl/t/rpl_row_delayed_ins.test @@ -1,2 +1,2 @@ let $engine_type=myisam; --- source extra/rpl_tests/rpl_row_delayed_ins.test +-- source include/rpl_row_delayed_ins.test diff --git a/mysql-test/suite/rpl/t/rpl_row_drop_create_temp_table.test b/mysql-test/suite/rpl/t/rpl_row_drop_create_temp_table.test index c3aa937be6f..bc5c60749c0 100644 --- a/mysql-test/suite/rpl/t/rpl_row_drop_create_temp_table.test +++ b/mysql-test/suite/rpl/t/rpl_row_drop_create_temp_table.test @@ -7,5 +7,5 @@ --source include/have_innodb.inc --source include/master-slave.inc ---source extra/rpl_tests/rpl_drop_create_temp_table.test +--source include/rpl_drop_create_temp_table.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test b/mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test index 71cd4a5b9ae..2d5cde82dcc 100644 --- a/mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test +++ b/mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test @@ -9,5 +9,5 @@ let $rename_event_pos= `select @binlog_start_pos + 819`; # we disable the ps-protocol for this statement. --disable_ps_protocol --- source extra/rpl_tests/rpl_flsh_tbls.test +-- source include/rpl_flsh_tbls.test --enable_ps_protocol diff --git a/mysql-test/suite/rpl/t/rpl_row_func003.test b/mysql-test/suite/rpl/t/rpl_row_func003.test index c153bc70253..def987faede 100644 --- a/mysql-test/suite/rpl/t/rpl_row_func003.test +++ b/mysql-test/suite/rpl/t/rpl_row_func003.test @@ -8,5 +8,5 @@ -- source include/have_binlog_format_row.inc -- source include/master-slave.inc let $engine_type=INNODB; --- source extra/rpl_tests/rpl_row_func003.test +-- source include/rpl_row_func003.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_row_img_blobs.test b/mysql-test/suite/rpl/t/rpl_row_img_blobs.test index 467202391b0..21f224f5ad2 100644 --- a/mysql-test/suite/rpl/t/rpl_row_img_blobs.test +++ b/mysql-test/suite/rpl/t/rpl_row_img_blobs.test @@ -36,7 +36,7 @@ -- let $row_img_set=server_1:NOBLOB:N,server_2:NOBLOB:Y,server_3:NOBLOB:Y -- source include/rpl_row_img_set.inc --- let $row_img_test_script= extra/rpl_tests/rpl_row_img_blobs.test +-- let $row_img_test_script= include/rpl_row_img_blobs.test -- source include/rpl_row_img_general_loop.inc ## MINIMAL @@ -44,7 +44,7 @@ -- let $row_img_set=server_1:MINIMAL:N,server_2:MINIMAL:Y,server_3:MINIMAL:Y -- source include/rpl_row_img_set.inc --- let $row_img_test_script= extra/rpl_tests/rpl_row_img_blobs.test +-- let $row_img_test_script= include/rpl_row_img_blobs.test -- source include/rpl_row_img_general_loop.inc ## FULL @@ -52,7 +52,7 @@ -- let $row_img_set=server_1:FULL:N,server_2:FULL:Y,server_3:FULL:Y -- source include/rpl_row_img_set.inc --- let $row_img_test_script= extra/rpl_tests/rpl_row_img_blobs.test +-- let $row_img_test_script= include/rpl_row_img_blobs.test -- source include/rpl_row_img_general_loop.inc diff --git a/mysql-test/suite/rpl/t/rpl_row_img_eng_min.test b/mysql-test/suite/rpl/t/rpl_row_img_eng_min.test index 24b9655bd81..06764fe8f07 100644 --- a/mysql-test/suite/rpl/t/rpl_row_img_eng_min.test +++ b/mysql-test/suite/rpl/t/rpl_row_img_eng_min.test @@ -29,7 +29,7 @@ -- let $row_img_set=server_1:MINIMAL:N,server_2:MINIMAL:Y,server_3:MINIMAL:Y -- source include/rpl_row_img_set.inc --- let $row_img_test_script= extra/rpl_tests/rpl_row_img.test +-- let $row_img_test_script= include/rpl_row_img.test -- source include/rpl_row_img_general_loop.inc -- let $row_img_set=server_1:FULL:N,server_2:FULL:Y,server_3:FULL:Y diff --git a/mysql-test/suite/rpl/t/rpl_row_img_eng_noblob.test b/mysql-test/suite/rpl/t/rpl_row_img_eng_noblob.test index 5d5f95a6552..7f4944b59ea 100644 --- a/mysql-test/suite/rpl/t/rpl_row_img_eng_noblob.test +++ b/mysql-test/suite/rpl/t/rpl_row_img_eng_noblob.test @@ -29,7 +29,7 @@ -- let $row_img_set=server_1:NOBLOB:N,server_2:NOBLOB:Y,server_3:NOBLOB:Y -- source include/rpl_row_img_set.inc --- let $row_img_test_script= extra/rpl_tests/rpl_row_img.test +-- let $row_img_test_script= include/rpl_row_img.test -- source include/rpl_row_img_general_loop.inc -- let $row_img_set=server_1:FULL:N,server_2:FULL:Y,server_3:FULL:Y diff --git a/mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog.test b/mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog.test index 6fdcd885930..68e07ef1f44 100644 --- a/mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog.test +++ b/mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog.test @@ -1,5 +1,5 @@ ################################################################################ -# Check file extra/rpl_tests/rpl_implicit_commit_binlog.test +# Check file include/rpl_implicit_commit_binlog.test ################################################################################ --source include/have_udf.inc --source include/have_binlog_format_row.inc @@ -8,5 +8,5 @@ --let $engine=Innodb set session storage_engine=innodb; ---source extra/rpl_tests/rpl_implicit_commit_binlog.test +--source include/rpl_implicit_commit_binlog.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_row_loaddata_concurrent.test b/mysql-test/suite/rpl/t/rpl_row_loaddata_concurrent.test index af4efed872f..c2cb2b4a7f6 100644 --- a/mysql-test/suite/rpl/t/rpl_row_loaddata_concurrent.test +++ b/mysql-test/suite/rpl/t/rpl_row_loaddata_concurrent.test @@ -10,4 +10,4 @@ DROP TABLE t1; let $lock_option= CONCURRENT; let $engine_type=MyISAM; --- source extra/rpl_tests/rpl_loaddata.test +-- source include/rpl_loaddata.test diff --git a/mysql-test/suite/rpl/t/rpl_row_log.test b/mysql-test/suite/rpl/t/rpl_row_log.test index 1d37d4327d0..25fcc4f4e58 100644 --- a/mysql-test/suite/rpl/t/rpl_row_log.test +++ b/mysql-test/suite/rpl/t/rpl_row_log.test @@ -10,6 +10,6 @@ -- source include/have_binlog_format_row.inc -- source include/master-slave.inc let $engine_type=MyISAM; --- source extra/rpl_tests/rpl_log.test +-- source include/rpl_log.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_row_log_innodb.test b/mysql-test/suite/rpl/t/rpl_row_log_innodb.test index 0eccde7ecb9..92fe0eb9665 100644 --- a/mysql-test/suite/rpl/t/rpl_row_log_innodb.test +++ b/mysql-test/suite/rpl/t/rpl_row_log_innodb.test @@ -8,6 +8,6 @@ -- source include/have_innodb.inc -- source include/master-slave.inc let $engine_type=InnoDB; --- source extra/rpl_tests/rpl_log.test +-- source include/rpl_log.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_row_max_relay_size.test b/mysql-test/suite/rpl/t/rpl_row_max_relay_size.test index 3e057d48ec9..0ec85244a6b 100644 --- a/mysql-test/suite/rpl/t/rpl_row_max_relay_size.test +++ b/mysql-test/suite/rpl/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 include/rpl_max_relay_size.test; diff --git a/mysql-test/suite/rpl/t/rpl_row_mixing_engines.test b/mysql-test/suite/rpl/t/rpl_row_mixing_engines.test index cf402752812..c1a13cd9e52 100644 --- a/mysql-test/suite/rpl/t/rpl_row_mixing_engines.test +++ b/mysql-test/suite/rpl/t/rpl_row_mixing_engines.test @@ -8,5 +8,5 @@ let $engine_type=Innodb; let $database_name=test; ---source extra/rpl_tests/rpl_mixing_engines.test +--source include/rpl_mixing_engines.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_row_rec_comp_innodb.test b/mysql-test/suite/rpl/t/rpl_row_rec_comp_innodb.test index b3808680db2..39149f6bcbb 100644 --- a/mysql-test/suite/rpl/t/rpl_row_rec_comp_innodb.test +++ b/mysql-test/suite/rpl/t/rpl_row_rec_comp_innodb.test @@ -7,5 +7,5 @@ # -- let $engine= InnoDB --- source extra/rpl_tests/rpl_record_compare.test +-- source include/rpl_record_compare.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_row_rec_comp_myisam.test b/mysql-test/suite/rpl/t/rpl_row_rec_comp_myisam.test index 0d6b08bd0c1..d9c06d6b25f 100644 --- a/mysql-test/suite/rpl/t/rpl_row_rec_comp_myisam.test +++ b/mysql-test/suite/rpl/t/rpl_row_rec_comp_myisam.test @@ -27,6 +27,6 @@ UPDATE t1 SET c1= 0; DROP TABLE t1; -- sync_slave_with_master --- source extra/rpl_tests/rpl_record_compare.test +-- source include/rpl_record_compare.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_row_reset_slave.test b/mysql-test/suite/rpl/t/rpl_row_reset_slave.test index a970c161153..284c6154e8b 100644 --- a/mysql-test/suite/rpl/t/rpl_row_reset_slave.test +++ b/mysql-test/suite/rpl/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 include/rpl_reset_slave.test diff --git a/mysql-test/suite/rpl/t/rpl_row_show_relaylog_events.test b/mysql-test/suite/rpl/t/rpl_row_show_relaylog_events.test index 0882d603203..3d4b8f1e3eb 100644 --- a/mysql-test/suite/rpl/t/rpl_row_show_relaylog_events.test +++ b/mysql-test/suite/rpl/t/rpl_row_show_relaylog_events.test @@ -15,5 +15,5 @@ -- source include/have_binlog_format_row.inc -- source include/master-slave.inc --- source extra/rpl_tests/rpl_show_relaylog_events.inc +-- source include/rpl_show_relaylog_events.inc --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_row_sp002_innodb.test b/mysql-test/suite/rpl/t/rpl_row_sp002_innodb.test index c863c9c02e1..f096c157059 100644 --- a/mysql-test/suite/rpl/t/rpl_row_sp002_innodb.test +++ b/mysql-test/suite/rpl/t/rpl_row_sp002_innodb.test @@ -1,3 +1,3 @@ -- source include/have_innodb.inc let $engine_type=INNODB; --- source extra/rpl_tests/rpl_row_sp002.test +-- source include/rpl_row_sp002.test diff --git a/mysql-test/suite/rpl/t/rpl_row_sp003.test b/mysql-test/suite/rpl/t/rpl_row_sp003.test index f1cad89b58e..0a361202e94 100644 --- a/mysql-test/suite/rpl/t/rpl_row_sp003.test +++ b/mysql-test/suite/rpl/t/rpl_row_sp003.test @@ -12,5 +12,5 @@ -- source include/master-slave.inc let $engine_type=INNODB; --- source extra/rpl_tests/rpl_row_sp003.test +-- source include/rpl_row_sp003.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB.test b/mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB.test index f8ff2b2ca8e..c575a105b68 100644 --- a/mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB.test +++ b/mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB.test @@ -8,5 +8,5 @@ -- source include/have_binlog_format_row.inc -- source include/master-slave.inc let $engine_type=InnoDB; --- source extra/rpl_tests/rpl_row_sp006.test +-- source include/rpl_row_sp006.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_row_sp007_innodb.test b/mysql-test/suite/rpl/t/rpl_row_sp007_innodb.test index e2003092d10..6eaafa8cce5 100644 --- a/mysql-test/suite/rpl/t/rpl_row_sp007_innodb.test +++ b/mysql-test/suite/rpl/t/rpl_row_sp007_innodb.test @@ -1,3 +1,3 @@ -- source include/have_innodb.inc let $engine_type=INNODB; --- source extra/rpl_tests/rpl_row_sp007.test +-- source include/rpl_row_sp007.test diff --git a/mysql-test/suite/rpl/t/rpl_row_tabledefs_2myisam.test b/mysql-test/suite/rpl/t/rpl_row_tabledefs_2myisam.test index 030ec7d6541..e1ecf70206a 100644 --- a/mysql-test/suite/rpl/t/rpl_row_tabledefs_2myisam.test +++ b/mysql-test/suite/rpl/t/rpl_row_tabledefs_2myisam.test @@ -3,7 +3,7 @@ -- source include/master-slave.inc let $engine_type = 'MyISAM'; --- source extra/rpl_tests/rpl_row_tabledefs.test +-- source include/rpl_row_tabledefs.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb.test b/mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb.test index 35eddfc3ed4..49abc84c58a 100644 --- a/mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb.test +++ b/mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb.test @@ -4,7 +4,7 @@ -- source include/master-slave.inc let $engine_type = 'InnoDB'; --- source extra/rpl_tests/rpl_row_tabledefs.test +-- source include/rpl_row_tabledefs.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_row_trig004.test b/mysql-test/suite/rpl/t/rpl_row_trig004.test index e10e0d51039..0cbdea335be 100644 --- a/mysql-test/suite/rpl/t/rpl_row_trig004.test +++ b/mysql-test/suite/rpl/t/rpl_row_trig004.test @@ -10,6 +10,6 @@ -- source include/have_innodb.inc -- source include/master-slave.inc let $engine_type=INNODB; --- source extra/rpl_tests/rpl_trig004.test +-- source include/rpl_trig004.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync.test b/mysql-test/suite/rpl/t/rpl_semi_sync.test index d5f80619aeb..5c17bcb2344 100644 --- a/mysql-test/suite/rpl/t/rpl_semi_sync.test +++ b/mysql-test/suite/rpl/t/rpl_semi_sync.test @@ -1 +1 @@ ---source extra/rpl_tests/rpl_semi_sync.inc +--source include/rpl_semi_sync.inc diff --git a/mysql-test/suite/rpl/t/rpl_set_null_innodb.test b/mysql-test/suite/rpl/t/rpl_set_null_innodb.test index 5ef10263498..84f7adb32a9 100644 --- a/mysql-test/suite/rpl/t/rpl_set_null_innodb.test +++ b/mysql-test/suite/rpl/t/rpl_set_null_innodb.test @@ -3,5 +3,5 @@ -- source include/master-slave.inc -- let $engine= InnoDB --- source extra/rpl_tests/rpl_set_null.test +-- source include/rpl_set_null.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_set_null_myisam.test b/mysql-test/suite/rpl/t/rpl_set_null_myisam.test index 13cd7c3e4a8..db1bd4b77e7 100644 --- a/mysql-test/suite/rpl/t/rpl_set_null_myisam.test +++ b/mysql-test/suite/rpl/t/rpl_set_null_myisam.test @@ -2,5 +2,5 @@ -- source include/master-slave.inc -- let $engine= MyISAM --- source extra/rpl_tests/rpl_set_null.test +-- source include/rpl_set_null.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_skip_replication.test b/mysql-test/suite/rpl/t/rpl_skip_replication.test index c57256780a4..66fdbb8915a 100644 --- a/mysql-test/suite/rpl/t/rpl_skip_replication.test +++ b/mysql-test/suite/rpl/t/rpl_skip_replication.test @@ -1 +1 @@ ---source extra/rpl_tests/rpl_skip_replication.inc +--source include/rpl_skip_replication.inc diff --git a/mysql-test/suite/rpl/t/rpl_special_charset.test b/mysql-test/suite/rpl/t/rpl_special_charset.test index 6f196005711..fa19a17b1e4 100644 --- a/mysql-test/suite/rpl/t/rpl_special_charset.test +++ b/mysql-test/suite/rpl/t/rpl_special_charset.test @@ -1 +1 @@ ---source extra/rpl_tests/rpl_special_charset.inc +--source include/rpl_special_charset.inc diff --git a/mysql-test/suite/rpl/t/rpl_sporadic_master.test b/mysql-test/suite/rpl/t/rpl_sporadic_master.test index 0a756982047..397756af396 100644 --- a/mysql-test/suite/rpl/t/rpl_sporadic_master.test +++ b/mysql-test/suite/rpl/t/rpl_sporadic_master.test @@ -1 +1 @@ ---source extra/rpl_tests/rpl_sporadic_master.inc +--source include/rpl_sporadic_master.inc diff --git a/mysql-test/suite/rpl/t/rpl_ssl.test b/mysql-test/suite/rpl/t/rpl_ssl.test index 883b367e9f2..c4a534b9294 100644 --- a/mysql-test/suite/rpl/t/rpl_ssl.test +++ b/mysql-test/suite/rpl/t/rpl_ssl.test @@ -1 +1 @@ ---source extra/rpl_tests/rpl_ssl.inc +--source include/rpl_ssl.inc diff --git a/mysql-test/suite/rpl/t/rpl_stm_EE_err2.test b/mysql-test/suite/rpl/t/rpl_stm_EE_err2.test index face651b9a1..07b1000c99b 100644 --- a/mysql-test/suite/rpl/t/rpl_stm_EE_err2.test +++ b/mysql-test/suite/rpl/t/rpl_stm_EE_err2.test @@ -5,4 +5,4 @@ ############################## -- source include/have_binlog_format_mixed_or_statement.inc let $engine_type=myisam; --- source extra/rpl_tests/rpl_stm_EE_err2.test +-- source include/rpl_stm_EE_err2.test diff --git a/mysql-test/suite/rpl/t/rpl_stm_binlog_max_cache_size.test b/mysql-test/suite/rpl/t/rpl_stm_binlog_max_cache_size.test index 93cc06111e4..f893f9090e4 100644 --- a/mysql-test/suite/rpl/t/rpl_stm_binlog_max_cache_size.test +++ b/mysql-test/suite/rpl/t/rpl_stm_binlog_max_cache_size.test @@ -4,5 +4,5 @@ --source include/have_binlog_format_statement.inc --source include/master-slave.inc ---source extra/rpl_tests/rpl_binlog_max_cache_size.test +--source include/rpl_binlog_max_cache_size.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_stm_conflicts.test b/mysql-test/suite/rpl/t/rpl_stm_conflicts.test index cd9e71cbff9..a4f592531a3 100644 --- a/mysql-test/suite/rpl/t/rpl_stm_conflicts.test +++ b/mysql-test/suite/rpl/t/rpl_stm_conflicts.test @@ -1,6 +1,6 @@ source include/have_binlog_format_mixed_or_statement.inc; source include/master-slave.inc; -source extra/rpl_tests/rpl_conflicts.test; +source include/rpl_conflicts.test; --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_stm_drop_create_temp_table.test b/mysql-test/suite/rpl/t/rpl_stm_drop_create_temp_table.test index b395654a714..b971af71766 100644 --- a/mysql-test/suite/rpl/t/rpl_stm_drop_create_temp_table.test +++ b/mysql-test/suite/rpl/t/rpl_stm_drop_create_temp_table.test @@ -8,5 +8,5 @@ --source include/have_innodb.inc --source include/master-slave.inc ---source extra/rpl_tests/rpl_drop_create_temp_table.test +--source include/rpl_drop_create_temp_table.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test b/mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test index 83ef8699425..70178c2e32d 100644 --- a/mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test +++ b/mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test @@ -3,4 +3,4 @@ --source include/binlog_start_pos.inc let $rename_event_pos= `select @binlog_start_pos + 578`; --- source extra/rpl_tests/rpl_flsh_tbls.test +-- source include/rpl_flsh_tbls.test diff --git a/mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog.test b/mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog.test index 774c87f551e..a095f7f7905 100644 --- a/mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog.test +++ b/mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog.test @@ -1,5 +1,5 @@ ################################################################################ -# Check file extra/rpl_tests/rpl_implicit_commit_binlog.test +# Check file include/rpl_implicit_commit_binlog.test ################################################################################ --source include/have_udf.inc --source include/have_binlog_format_statement.inc @@ -8,5 +8,5 @@ --let $engine=Innodb set session storage_engine=innodb; ---source extra/rpl_tests/rpl_implicit_commit_binlog.test +--source include/rpl_implicit_commit_binlog.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_stm_innodb.test b/mysql-test/suite/rpl/t/rpl_stm_innodb.test index 97bfd168438..dbfbc7f6c64 100644 --- a/mysql-test/suite/rpl/t/rpl_stm_innodb.test +++ b/mysql-test/suite/rpl/t/rpl_stm_innodb.test @@ -5,5 +5,5 @@ 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_innodb.test; --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_stm_loaddata_concurrent.test b/mysql-test/suite/rpl/t/rpl_stm_loaddata_concurrent.test index 32de2a94cbb..4409a1a8db5 100644 --- a/mysql-test/suite/rpl/t/rpl_stm_loaddata_concurrent.test +++ b/mysql-test/suite/rpl/t/rpl_stm_loaddata_concurrent.test @@ -11,4 +11,4 @@ DROP TABLE t1; let $lock_option= CONCURRENT; let $engine_type=MyISAM; --- source extra/rpl_tests/rpl_loaddata.test +-- source include/rpl_loaddata.test diff --git a/mysql-test/suite/rpl/t/rpl_stm_loadfile.test b/mysql-test/suite/rpl/t/rpl_stm_loadfile.test index 016d3ed6090..5ff3846d2b9 100644 --- a/mysql-test/suite/rpl/t/rpl_stm_loadfile.test +++ b/mysql-test/suite/rpl/t/rpl_stm_loadfile.test @@ -19,6 +19,6 @@ disable_query_log; call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); enable_query_log; --- source extra/rpl_tests/rpl_loadfile.test +-- source include/rpl_loadfile.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_stm_log.test b/mysql-test/suite/rpl/t/rpl_stm_log.test index 23130528465..4a0df44204a 100644 --- a/mysql-test/suite/rpl/t/rpl_stm_log.test +++ b/mysql-test/suite/rpl/t/rpl_stm_log.test @@ -2,7 +2,7 @@ -- source include/have_binlog_format_statement.inc -- source include/master-slave.inc let $engine_type=MyISAM; --- source extra/rpl_tests/rpl_log.test +-- source include/rpl_log.test # End of 4.1 tests --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_stm_max_relay_size.test b/mysql-test/suite/rpl/t/rpl_stm_max_relay_size.test index 1a7139c889a..bea51ed21f9 100644 --- a/mysql-test/suite/rpl/t/rpl_stm_max_relay_size.test +++ b/mysql-test/suite/rpl/t/rpl_stm_max_relay_size.test @@ -5,4 +5,4 @@ # Requires statement logging -- source include/have_binlog_format_mixed_or_statement.inc --- source extra/rpl_tests/rpl_max_relay_size.test +-- source include/rpl_max_relay_size.test diff --git a/mysql-test/suite/rpl/t/rpl_stm_mix_show_relaylog_events.test b/mysql-test/suite/rpl/t/rpl_stm_mix_show_relaylog_events.test index 2b7aeed28ce..ab823799f5d 100644 --- a/mysql-test/suite/rpl/t/rpl_stm_mix_show_relaylog_events.test +++ b/mysql-test/suite/rpl/t/rpl_stm_mix_show_relaylog_events.test @@ -15,5 +15,5 @@ -- 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_show_relaylog_events.inc --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_stm_mixing_engines.test b/mysql-test/suite/rpl/t/rpl_stm_mixing_engines.test index 9a92d60a2a1..9cb440b6599 100644 --- a/mysql-test/suite/rpl/t/rpl_stm_mixing_engines.test +++ b/mysql-test/suite/rpl/t/rpl_stm_mixing_engines.test @@ -8,7 +8,7 @@ let $engine_type=Innodb; let $database_name=test; ---source extra/rpl_tests/rpl_mixing_engines.test +--source include/rpl_mixing_engines.test # # BUG#49522: Replication problem with mixed MyISAM/InnoDB diff --git a/mysql-test/suite/rpl/t/rpl_stm_multi_query.test b/mysql-test/suite/rpl/t/rpl_stm_multi_query.test index e234f4b9622..2a593efdb35 100644 --- a/mysql-test/suite/rpl/t/rpl_stm_multi_query.test +++ b/mysql-test/suite/rpl/t/rpl_stm_multi_query.test @@ -4,4 +4,4 @@ # one binlog event containing all queries) -- source include/have_binlog_format_mixed_or_statement.inc --- source extra/rpl_tests/rpl_multi_query.test +-- source include/rpl_multi_query.test diff --git a/mysql-test/suite/rpl/t/rpl_stm_relay_ign_space.test b/mysql-test/suite/rpl/t/rpl_stm_relay_ign_space.test index f72300ee2de..b4e53358712 100644 --- a/mysql-test/suite/rpl/t/rpl_stm_relay_ign_space.test +++ b/mysql-test/suite/rpl/t/rpl_stm_relay_ign_space.test @@ -1 +1 @@ ---source extra/rpl_tests/rpl_stm_relay_ign_space.inc +--source include/rpl_stm_relay_ign_space.inc diff --git a/mysql-test/suite/rpl/t/rpl_stm_reset_slave.test b/mysql-test/suite/rpl/t/rpl_stm_reset_slave.test index 6a99d4e1613..e32b0a789b2 100644 --- a/mysql-test/suite/rpl/t/rpl_stm_reset_slave.test +++ b/mysql-test/suite/rpl/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 include/rpl_reset_slave.test # End of 4.1 tests # diff --git a/mysql-test/suite/rpl/t/rpl_stm_start_stop_slave.test b/mysql-test/suite/rpl/t/rpl_stm_start_stop_slave.test index 76b2aed3f24..f401db33853 100644 --- a/mysql-test/suite/rpl/t/rpl_stm_start_stop_slave.test +++ b/mysql-test/suite/rpl/t/rpl_stm_start_stop_slave.test @@ -1,5 +1,5 @@ ################################################################################ -# Please, check ./extra/rpl_tests/rpl_start_stop_slave.test +# Please, check ./include/rpl_start_stop_slave.test ################################################################################ --source include/have_binlog_format_statement.inc --source include/have_innodb.inc @@ -14,7 +14,7 @@ SET @old_innodb_flush_log_at_trx_commit= @@global.innodb_flush_log_at_trx_commit SET @@global.innodb_flush_log_at_trx_commit= 0; SET @@session.binlog_direct_non_transactional_updates= FALSE; ---source ./extra/rpl_tests/rpl_start_stop_slave.test +--source ./include/rpl_start_stop_slave.test # clean up --connection slave diff --git a/mysql-test/suite/rpl/t/rpl_stm_stop_middle_group.test b/mysql-test/suite/rpl/t/rpl_stm_stop_middle_group.test index 31880d17dfb..f2315f5e8c7 100644 --- a/mysql-test/suite/rpl/t/rpl_stm_stop_middle_group.test +++ b/mysql-test/suite/rpl/t/rpl_stm_stop_middle_group.test @@ -1,5 +1,5 @@ ################################################################################### -# Please, check extra/rpl_tests/rpl_stop_middle_group.test. +# Please, check include/rpl_stop_middle_group.test. ################################################################################### -- source include/have_debug.inc -- source include/have_innodb.inc @@ -7,5 +7,5 @@ -- source include/master-slave.inc SET @@session.binlog_direct_non_transactional_updates= FALSE; --- source extra/rpl_tests/rpl_stop_middle_group.test +-- source include/rpl_stop_middle_group.test --source include/rpl_end.inc diff --git a/mysql-test/suite/rpl/t/rpl_stop_slave.test b/mysql-test/suite/rpl/t/rpl_stop_slave.test index c650991a42b..291524126ec 100644 --- a/mysql-test/suite/rpl/t/rpl_stop_slave.test +++ b/mysql-test/suite/rpl/t/rpl_stop_slave.test @@ -30,14 +30,14 @@ source include/start_slave.inc; --echo # CREATE TEMPORARY TABLE with InnoDB engine --echo # ----------------------------------------- let $tmp_table_stm= CREATE TEMPORARY TABLE tt1(c1 INT) ENGINE = InnoDB; -source extra/rpl_tests/rpl_stop_slave.test; +source include/rpl_stop_slave.test; --echo --echo # CREATE TEMPORARY TABLE ... SELECT with InnoDB engine --echo # ---------------------------------------------------- let $tmp_table_stm= CREATE TEMPORARY TABLE tt1(c1 INT) ENGINE = InnoDB SELECT c1 FROM t2; -source extra/rpl_tests/rpl_stop_slave.test; +source include/rpl_stop_slave.test; # Don't need to verify 'CREATE TEMPORARY TABLE' with MyIASM engine, as it # never is binlogged into a transaction since 5.5. diff --git a/mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test b/mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test index cd826c6be1e..2625508515b 100644 --- a/mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test +++ b/mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test @@ -1 +1 @@ ---source extra/rpl_tests/rpl_switch_stm_row_mixed.inc +--source include/rpl_switch_stm_row_mixed.inc diff --git a/mysql-test/suite/rpl/t/rpl_sync.test b/mysql-test/suite/rpl/t/rpl_sync.test index ec98a344282..bdb0d8ec4cc 100644 --- a/mysql-test/suite/rpl/t/rpl_sync.test +++ b/mysql-test/suite/rpl/t/rpl_sync.test @@ -1,2 +1,2 @@ ---source extra/rpl_tests/rpl_sync.inc +--source include/rpl_sync_test.inc diff --git a/mysql-test/suite/rpl/t/rpl_temporal_format_default_to_default.test b/mysql-test/suite/rpl/t/rpl_temporal_format_default_to_default.test index 99a70e011c4..d976ae3757b 100644 --- a/mysql-test/suite/rpl/t/rpl_temporal_format_default_to_default.test +++ b/mysql-test/suite/rpl/t/rpl_temporal_format_default_to_default.test @@ -1 +1 @@ ---source extra/rpl_tests/rpl_temporal_format_default_to_default.inc +--source include/rpl_temporal_format_default_to_default.inc diff --git a/mysql-test/suite/rpl/t/rpl_test_framework.test b/mysql-test/suite/rpl/t/rpl_test_framework.test index e0f961caff1..cf559072e2f 100644 --- a/mysql-test/suite/rpl/t/rpl_test_framework.test +++ b/mysql-test/suite/rpl/t/rpl_test_framework.test @@ -5,8 +5,8 @@ # is correct. # # We test a number of different topologies. Each topology is tested -# in extra/rpl_tests/rpl_test_framework.inc. See -# extra/rpl_tests/rpl_test_framework.inc for details on how the sync +# in include/rpl_test_framework.inc. See +# include/rpl_test_framework.inc for details on how the sync # chain is tested. # # ==== Related bugs ==== @@ -36,7 +36,7 @@ CREATE TABLE t1 (a INT); --source include/rpl_end.inc # Initialize $next_number before first call to -# extra/rpl_tests/rpl_test_framework.text +# include/rpl_test_framework.text --let $next_number= 0 @@ -46,43 +46,43 @@ CREATE TABLE t1 (a INT); --let $rpl_topology= 1 -> 2 --let $masters= 1,3 ---source extra/rpl_tests/rpl_test_framework.inc +--source include/rpl_test_framework.inc --let $rpl_topology= 2 -> 3 --let $masters= 1,2 ---source extra/rpl_tests/rpl_test_framework.inc +--source include/rpl_test_framework.inc --let $rpl_topology= none --let $masters= 1,2,3 ---source extra/rpl_tests/rpl_test_framework.inc +--source include/rpl_test_framework.inc --let $rpl_topology= 1->2, 2->1 --let $masters= 1,3 ---source extra/rpl_tests/rpl_test_framework.inc +--source include/rpl_test_framework.inc --let $rpl_topology= 1->2->1 --let $masters= 2,3 ---source extra/rpl_tests/rpl_test_framework.inc +--source include/rpl_test_framework.inc --let $rpl_topology= 2->1->2 --let $masters= 1,3 ---source extra/rpl_tests/rpl_test_framework.inc +--source include/rpl_test_framework.inc --let $rpl_topology= 1->2->3 --let $masters= 1 ---source extra/rpl_tests/rpl_test_framework.inc +--source include/rpl_test_framework.inc --let $rpl_topology= 2->3->2->1 --let $masters= 3 ---source extra/rpl_tests/rpl_test_framework.inc +--source include/rpl_test_framework.inc --let $rpl_topology= 1->2,2->3,3->1 --let $masters= 3 ---source extra/rpl_tests/rpl_test_framework.inc +--source include/rpl_test_framework.inc --let $rpl_topology= 1->3->2->1 --let $masters= 3 ---source extra/rpl_tests/rpl_test_framework.inc +--source include/rpl_test_framework.inc --echo ==== Test 6-server topologies ==== @@ -91,19 +91,19 @@ CREATE TABLE t1 (a INT); --let $rpl_topology= 1->2->3->4->1->5->6 --let $masters= 1 ---source extra/rpl_tests/rpl_test_framework.inc +--source include/rpl_test_framework.inc --let $rpl_topology= 3->4->5->6->3->1->2 --let $masters= 4 ---source extra/rpl_tests/rpl_test_framework.inc +--source include/rpl_test_framework.inc --let $rpl_topology= 6->5->4->3->2->1 --let $masters= 6 ---source extra/rpl_tests/rpl_test_framework.inc +--source include/rpl_test_framework.inc --let $rpl_topology= 1->2->3->1,4->5->6 --let $masters= 3,4 ---source extra/rpl_tests/rpl_test_framework.inc +--source include/rpl_test_framework.inc --echo ==== Test 9-server topology ==== @@ -112,7 +112,7 @@ CREATE TABLE t1 (a INT); --let $rpl_topology= 1->2, 2->3, 3->4, 4->5, 5->1, 1->6, 6->7, 6->8, 8->9 --let $masters= 2 ---source extra/rpl_tests/rpl_test_framework.inc +--source include/rpl_test_framework.inc if ($mtr_supports_more_than_10_servers) { --echo ==== Test 15-server topologies ==== @@ -121,12 +121,12 @@ if ($mtr_supports_more_than_10_servers) { --let $rpl_topology= 1->2->3->4->5->6->7->8->9->10->11->12->13->14->15->1 --let $masters= 2 ---source extra/rpl_tests/rpl_test_framework.inc +--source include/rpl_test_framework.inc # This is a binary tree --let $rpl_topology= 1->2->4->8,1->3->6->12,2->5->10,3->7->14,4->9,5->11,6->13,7->15 --let $masters= 1 ---source extra/rpl_tests/rpl_test_framework.inc +--source include/rpl_test_framework.inc } --echo ==== Clean up ==== diff --git a/mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test b/mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test index bc4119f332f..7029729d299 100644 --- a/mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test +++ b/mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test @@ -9,7 +9,7 @@ source include/have_binlog_format_row.inc; source include/master-slave.inc; LET $ENGINE_TYPE= MyISAM; -source extra/rpl_tests/rpl_tmp_table_and_DDL.test; +source include/rpl_tmp_table_and_DDL.test; sync_slave_with_master; # diff --git a/mysql-test/suite/rpl/t/rpl_truncate_2myisam.test b/mysql-test/suite/rpl/t/rpl_truncate_2myisam.test index 4a8994d1878..e8b55b86aba 100644 --- a/mysql-test/suite/rpl/t/rpl_truncate_2myisam.test +++ b/mysql-test/suite/rpl/t/rpl_truncate_2myisam.test @@ -1,2 +1,2 @@ let $engine=MyISAM; ---source extra/rpl_tests/rpl_truncate.test +--source include/rpl_truncate.test diff --git a/mysql-test/suite/rpl/t/rpl_truncate_3innodb.test b/mysql-test/suite/rpl/t/rpl_truncate_3innodb.test index fbedaed87c1..bac911b985e 100644 --- a/mysql-test/suite/rpl/t/rpl_truncate_3innodb.test +++ b/mysql-test/suite/rpl/t/rpl_truncate_3innodb.test @@ -1,3 +1,3 @@ --source include/have_innodb.inc let $engine=InnoDB; ---source extra/rpl_tests/rpl_truncate.test +--source include/rpl_truncate.test diff --git a/mysql-test/suite/rpl/t/rpl_typeconv.test b/mysql-test/suite/rpl/t/rpl_typeconv.test index 4dbfc27d088..c2517086258 100644 --- a/mysql-test/suite/rpl/t/rpl_typeconv.test +++ b/mysql-test/suite/rpl/t/rpl_typeconv.test @@ -1 +1 @@ ---source extra/rpl_tests/rpl_typeconv.inc +--source include/rpl_typeconv.inc diff --git a/storage/tokudb/mysql-test/rpl/include/rpl_tokudb_row_img_general_loop.inc b/storage/tokudb/mysql-test/rpl/include/rpl_tokudb_row_img_general_loop.inc index 321f09353a1..3c4308c762c 100644 --- a/storage/tokudb/mysql-test/rpl/include/rpl_tokudb_row_img_general_loop.inc +++ b/storage/tokudb/mysql-test/rpl/include/rpl_tokudb_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/storage/tokudb/mysql-test/rpl/t/rpl_deadlock_tokudb.test b/storage/tokudb/mysql-test/rpl/t/rpl_deadlock_tokudb.test index dffdc1527e4..c30345f2d79 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_deadlock_tokudb.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_deadlock_tokudb.test @@ -1,4 +1,4 @@ -- source include/have_tokudb.inc let $engine_type=TokuDB; --- source extra/rpl_tests/rpl_deadlock.test +-- source suite/rpl/include/rpl_deadlock.test diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_extra_col_master_tokudb.test b/storage/tokudb/mysql-test/rpl/t/rpl_extra_col_master_tokudb.test index 4ee8fd38010..10525618d7d 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_extra_col_master_tokudb.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_extra_col_master_tokudb.test @@ -6,6 +6,6 @@ -- source include/have_tokudb.inc let $engine_type=TokuDB; ---source extra/rpl_tests/rpl_extra_col_master.test +--source suite/rpl/include/rpl_extra_col_master.test --source include/rpl_end.inc diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_extra_col_slave_tokudb.test b/storage/tokudb/mysql-test/rpl/t/rpl_extra_col_slave_tokudb.test index b3d157a513d..e3d7e31aa7a 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_extra_col_slave_tokudb.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_extra_col_slave_tokudb.test @@ -3,5 +3,5 @@ -- source include/master-slave.inc let $engine_type='TokuDB'; --- source extra/rpl_tests/rpl_extra_col_slave.test +-- source suite/rpl/include/rpl_extra_col_slave.test --source include/rpl_end.inc diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_not_null_tokudb.test b/storage/tokudb/mysql-test/rpl/t/rpl_not_null_tokudb.test index 53cf555ce64..65caf610cfe 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_not_null_tokudb.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_not_null_tokudb.test @@ -16,5 +16,5 @@ --source include/master-slave.inc let $engine=TokuDB; ---source extra/rpl_tests/rpl_not_null.test +--source suite/rpl/include/rpl_not_null.test --source include/rpl_end.inc diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_relay_space_tokudb.test b/storage/tokudb/mysql-test/rpl/t/rpl_relay_space_tokudb.test index 7013d20cad5..b8b6a1c27ce 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_relay_space_tokudb.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_relay_space_tokudb.test @@ -1,3 +1,3 @@ -- source include/have_tokudb.inc let $engine_type=TokuDB; --- source extra/rpl_tests/rpl_sv_relay_space.test +-- source suite/rpl/include/rpl_sv_relay_space.test diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_row_basic_3tokudb.test b/storage/tokudb/mysql-test/rpl/t/rpl_row_basic_3tokudb.test index 4c38646b112..3a70f5ed565 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_row_basic_3tokudb.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_row_basic_3tokudb.test @@ -6,6 +6,6 @@ connection slave; let $bit_field_special = ALL_LOSSY; let $type = 'TokuDB'; let $extra_index = ; ---source extra/rpl_tests/rpl_row_basic.test +--source suite/rpl/include/rpl_row_basic.test --source include/rpl_end.inc diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_row_blob_tokudb.test b/storage/tokudb/mysql-test/rpl/t/rpl_row_blob_tokudb.test index 50255d614de..0d18d2daca9 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_row_blob_tokudb.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_row_blob_tokudb.test @@ -9,6 +9,6 @@ -- source include/have_binlog_format_row.inc -- source include/master-slave.inc let $engine_type=TokuDB; --- source extra/rpl_tests/rpl_row_blob.test +-- source suite/rpl/include/rpl_row_blob.test --source include/rpl_end.inc diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_row_rec_comp_tokudb.test b/storage/tokudb/mysql-test/rpl/t/rpl_row_rec_comp_tokudb.test index 8d84de1df7d..c19fd0bd658 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_row_rec_comp_tokudb.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_row_rec_comp_tokudb.test @@ -7,5 +7,5 @@ # -- let $engine= TokuDB --- source extra/rpl_tests/rpl_record_compare.test +-- source suite/rpl/include/rpl_record_compare.test --source include/rpl_end.inc diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_row_sp002_tokudb.test b/storage/tokudb/mysql-test/rpl/t/rpl_row_sp002_tokudb.test index 4dfbc689215..f89765f9bbb 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_row_sp002_tokudb.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_row_sp002_tokudb.test @@ -1,3 +1,3 @@ -- source include/have_tokudb.inc let $engine_type=TokuDB; --- source extra/rpl_tests/rpl_row_sp002.test +-- source suite/rpl/include/rpl_row_sp002.test diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_row_sp007_tokudb.test b/storage/tokudb/mysql-test/rpl/t/rpl_row_sp007_tokudb.test index 691049e8cf5..f0f6eb777ed 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_row_sp007_tokudb.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_row_sp007_tokudb.test @@ -1,3 +1,3 @@ -- source include/have_tokudb.inc let $engine_type=TokuDB; --- source extra/rpl_tests/rpl_row_sp007.test +-- source suite/rpl/include/rpl_row_sp007.test diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_row_tabledefs_3tokudb.test b/storage/tokudb/mysql-test/rpl/t/rpl_row_tabledefs_3tokudb.test index e4558d0e87a..65032a4b934 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_row_tabledefs_3tokudb.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_row_tabledefs_3tokudb.test @@ -4,7 +4,7 @@ -- source include/master-slave.inc let $engine_type=TokuDB; --- source extra/rpl_tests/rpl_row_tabledefs.test +-- source suite/rpl/include/rpl_row_tabledefs.test --source include/rpl_end.inc diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_set_null_tokudb.test b/storage/tokudb/mysql-test/rpl/t/rpl_set_null_tokudb.test index 78ae341b29f..a30dafe0c3c 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_set_null_tokudb.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_set_null_tokudb.test @@ -3,5 +3,5 @@ -- source include/have_tokudb.inc -- let $engine= TokuDB --- source extra/rpl_tests/rpl_set_null.test +-- source suite/rpl/include/rpl_set_null.test --source include/rpl_end.inc diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_stm_tokudb.test b/storage/tokudb/mysql-test/rpl/t/rpl_stm_tokudb.test index 25f0ab3b934..606850b5330 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_stm_tokudb.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_stm_tokudb.test @@ -7,4 +7,5 @@ source include/have_binlog_format_statement.inc; # gtids disabled because it tests DROP TEMPORARY inside a transaction source extra/rpl_tests/rpl_tokudb.test; + --source include/rpl_end.inc diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_commit_after_flush.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_commit_after_flush.test index b39661c111b..415a358b8a5 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_commit_after_flush.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_commit_after_flush.test @@ -1,5 +1,5 @@ -- source include/have_tokudb.inc -- source include/master-slave.inc let $engine_type=tokudb; --- source extra/rpl_tests/rpl_commit_after_flush.test +-- source suite/rpl/include/rpl_commit_after_flush.test --source include/rpl_end.inc diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_insert_id.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_insert_id.test index b0308402b40..682fedb6217 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_insert_id.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_insert_id.test @@ -3,4 +3,4 @@ ################################# -- source include/have_tokudb.inc let $engine_type=tokudb; --- source extra/rpl_tests/rpl_insert_id.test +-- source suite/rpl/include/rpl_insert_id.test diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_insert_id_pk.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_insert_id_pk.test index 103cad8a266..6e6ff8b1dc2 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_insert_id_pk.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_insert_id_pk.test @@ -3,4 +3,4 @@ ################################# -- source include/have_tokudb.inc let $engine_type=tokudb; --- source extra/rpl_tests/rpl_insert_id_pk.test +-- source suite/rpl/include/rpl_insert_id_pk.test diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_multi_update.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_multi_update.test index 89a73b1506f..d8c07642441 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_multi_update.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_multi_update.test @@ -1,3 +1,3 @@ -- source include/have_tokudb.inc let $engine_type=TokuDB; --- source extra/rpl_tests/rpl_multi_update.test +-- source suite/rpl/include/rpl_multi_update.test diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_multi_update2.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_multi_update2.test index b73b302d024..731dadfc403 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_multi_update2.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_multi_update2.test @@ -8,5 +8,5 @@ --source include/master-slave.inc call mtr.add_suppression('Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT'); let $engine_type=TokuDB; ---source extra/rpl_tests/rpl_multi_update2.test +--source suite/rpl/include/rpl_multi_update2.test --source include/rpl_end.inc diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_multi_update3.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_multi_update3.test index 2cdf44bff16..caf2d64eec0 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_multi_update3.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_multi_update3.test @@ -8,5 +8,5 @@ --source include/master-slave.inc call mtr.add_suppression('Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT.'); let $engine_type=TokuDB; ---source extra/rpl_tests/rpl_multi_update3.test +--source suite/rpl/include/rpl_multi_update3.test --source include/rpl_end.inc diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_blobs.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_blobs.test index ff4a0435a5e..7bf9974c013 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_blobs.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_blobs.test @@ -31,7 +31,7 @@ skip Require rpl files from MySQL; -- let $row_img_set=server_1:NOBLOB:N,server_2:NOBLOB:Y,server_3:NOBLOB:Y -- source include/rpl_row_img_set.inc --- let $row_img_test_script= extra/rpl_tests/rpl_row_img_blobs.test +-- let $row_img_test_script= suite/rpl/include/rpl_row_img_blobs.test -- source suite/tokudb.rpl/include/rpl_tokudb_row_img_general_loop.inc ## MINIMAL @@ -39,7 +39,7 @@ skip Require rpl files from MySQL; -- let $row_img_set=server_1:MINIMAL:N,server_2:MINIMAL:Y,server_3:MINIMAL:Y -- source include/rpl_row_img_set.inc --- let $row_img_test_script= extra/rpl_tests/rpl_row_img_blobs.test +-- let $row_img_test_script= suite/rpl/include/rpl_row_img_blobs.test -- source suite/tokudb.rpl/include/rpl_tokudb_row_img_general_loop.inc ## FULL @@ -47,7 +47,7 @@ skip Require rpl files from MySQL; -- let $row_img_set=server_1:FULL:N,server_2:FULL:Y,server_3:FULL:Y -- source include/rpl_row_img_set.inc --- let $row_img_test_script= extra/rpl_tests/rpl_row_img_blobs.test +-- let $row_img_test_script= suite/rpl/include/rpl_row_img_blobs.test -- source suite/tokudb.rpl/include/rpl_tokudb_row_img_general_loop.inc diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_full.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_full.test index 68ff71752ac..6e78231d20f 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_full.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_full.test @@ -35,7 +35,7 @@ skip Require rpl files from MySQL; -- let $row_img_set=server_1:FULL:N,server_2:FULL:Y,server_3:FULL:Y -- source include/rpl_row_img_set.inc --- 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 suite/tokudb.rpl/include/rpl_tokudb_row_img_general_loop.inc # @@ -45,7 +45,7 @@ skip Require rpl files from MySQL; -- echo ### Testing with TokuDB storage engine -- let $engine=TokuDB --- source extra/rpl_tests/rpl_row_empty_imgs.test +-- source suite/rpl/include/rpl_row_empty_imgs.test -- source include/rpl_end.inc diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_min.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_min.test index 3ba958fc691..9ac8b4da6db 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_min.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_min.test @@ -33,7 +33,7 @@ skip Require rpl files from MySQL; -- let $row_img_set=server_1:MINIMAL:N,server_2:MINIMAL:Y,server_3:MINIMAL:Y -- source include/rpl_row_img_set.inc --- 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 suite/tokudb.rpl/include/rpl_tokudb_row_img_general_loop.inc -- let $row_img_set=server_1:FULL:N,server_2:FULL:Y,server_3:FULL:Y diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_noblob.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_noblob.test index f539e3ac370..1875eee6bbf 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_noblob.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_eng_noblob.test @@ -33,7 +33,7 @@ skip Require rpl files from MySQL; -- let $row_img_set=server_1:NOBLOB:N,server_2:NOBLOB:Y,server_3:NOBLOB:Y -- source include/rpl_row_img_set.inc --- 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 suite/tokudb.rpl/include/rpl_tokudb_row_img_general_loop.inc -- let $row_img_set=server_1:FULL:N,server_2:FULL:Y,server_3:FULL:Y diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_full.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_full.test index 9dfd1675f53..2863c2bbeec 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_full.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_full.test @@ -32,7 +32,7 @@ skip Require rpl files from MySQL; -- let $row_img_set=server_1:FULL:N,server_2:FULL:Y,server_3:FULL:Y -- source include/rpl_row_img_set.inc --- let $row_img_test_script= extra/rpl_tests/rpl_row_img_diff_indexes.test +-- let $row_img_test_script= suite/rpl/include/rpl_row_img_diff_indexes.test -- source suite/tokudb.rpl/include/rpl_tokudb_row_img_general_loop.inc diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_min.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_min.test index 03e022940a6..389ebcab2d0 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_min.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_min.test @@ -32,7 +32,7 @@ skip Require rpl files from MySQL; -- let $row_img_set=server_1:MINIMAL:N,server_2:MINIMAL:Y,server_3:MINIMAL:Y -- source include/rpl_row_img_set.inc --- let $row_img_test_script= extra/rpl_tests/rpl_row_img_diff_indexes.test +-- let $row_img_test_script= suite/rpl/include/rpl_row_img_diff_indexes.test -- source suite/tokudb.rpl/include/rpl_tokudb_row_img_general_loop.inc -- let $row_img_set=server_1:FULL:N,server_2:FULL:Y,server_3:FULL:Y diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_noblob.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_noblob.test index ed147c8902b..3dcb7d3bf83 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_noblob.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_img_idx_noblob.test @@ -32,7 +32,7 @@ skip Require rpl files from MySQL; -- let $row_img_set=server_1:NOBLOB:N,server_2:NOBLOB:Y,server_3:NOBLOB:Y -- source include/rpl_row_img_set.inc --- let $row_img_test_script= extra/rpl_tests/rpl_row_img_diff_indexes.test +-- let $row_img_test_script= suite/rpl/include/rpl_row_img_diff_indexes.test -- source suite/tokudb.rpl/include/rpl_tokudb_row_img_general_loop.inc -- let $row_img_set=server_1:FULL:N,server_2:FULL:Y,server_3:FULL:Y diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_log.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_log.test index 826eb5eab86..c57b349f69b 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_log.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_log.test @@ -9,6 +9,6 @@ -- source include/have_tokudb.inc -- source include/master-slave.inc let $engine_type=TokuDB; --- source extra/rpl_tests/rpl_log.test +-- source suite/rpl/include/rpl_log.test --source include/rpl_end.inc diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_lower_case_table_names.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_lower_case_table_names.test index c9f6d9055b3..fdb9562075d 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_lower_case_table_names.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_lower_case_table_names.test @@ -1,8 +1,8 @@ # BUG#37656 # -# For details look into extra/rpl_tests/rpl_lower_case_table_names.test +# For details look into suite/rpl/include/rpl_lower_case_table_names.test # -skip Missing extra/rpl_tests/rpl_lower_case_table_names.test; +skip Missing suite/rpl/include/rpl_lower_case_table_names.test; -- source include/not_gtid_enabled.inc -- source include/have_tokudb.inc @@ -11,5 +11,5 @@ skip Missing extra/rpl_tests/rpl_lower_case_table_names.test; -- source include/master-slave.inc -- let $engine=TokuDB --- source extra/rpl_tests/rpl_lower_case_table_names.test +-- source suite/rpl/include/rpl_lower_case_table_names.test -- source include/rpl_end.inc diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_sp003.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_sp003.test index 1c5be34fb23..218548bcbf2 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_sp003.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_sp003.test @@ -9,5 +9,5 @@ -- source include/have_binlog_format_row.inc -- source include/master-slave.inc let $engine_type=TOKUDB; --- source extra/rpl_tests/rpl_row_sp003.test +-- source suite/rpl/include/rpl_row_sp003.test -- source include/rpl_end.inc diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_sp006.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_sp006.test index 064339b8e68..adc547bd5c6 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_sp006.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_sp006.test @@ -9,5 +9,5 @@ -- source include/have_binlog_format_row.inc -- source include/master-slave.inc let $engine_type=TokuDB; --- source extra/rpl_tests/rpl_row_sp006.test +-- source suite/rpl/include/rpl_row_sp006.test -- source include/rpl_end.inc diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_trig004.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_trig004.test index 471c5f8cc3d..34e11fd2d44 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_trig004.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_row_trig004.test @@ -13,6 +13,6 @@ -- source include/have_tokudb.inc -- source include/master-slave.inc let $engine_type=TOKUDB; --- source extra/rpl_tests/rpl_trig004.test +-- source suite/rpl/include/rpl_trig004.test -- source include/rpl_end.inc diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_stm_log.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_stm_log.test index b877d555619..396be22cc3c 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_stm_log.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_stm_log.test @@ -9,6 +9,6 @@ -- source include/have_tokudb.inc -- source include/master-slave.inc let $engine_type=TokuDB; --- source extra/rpl_tests/rpl_log.test +-- source suite/rpl/include/rpl_log.test --source include/rpl_end.inc diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_stm_mixed_lower_case_table_names.test b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_stm_mixed_lower_case_table_names.test index f9fd0e13b83..565b747ff1c 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_stm_mixed_lower_case_table_names.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_tokudb_stm_mixed_lower_case_table_names.test @@ -1,8 +1,8 @@ # BUG#37656 # -# For details look into extra/rpl_tests/rpl_lower_case_table_names.test +# For details look into suite/rpl/include/rpl_lower_case_table_names.test # -skip Missing extra/rpl_tests/rpl_lower_case_table_names.test; +skip Missing suite/rpl/include/rpl_lower_case_table_names.test; -- source include/have_tokudb.inc -- source include/not_windows.inc @@ -10,5 +10,5 @@ skip Missing extra/rpl_tests/rpl_lower_case_table_names.test; -- source include/master-slave.inc -- let $engine=TokuDB --- source extra/rpl_tests/rpl_lower_case_table_names.test +-- source suite/rpl/include/rpl_lower_case_table_names.test -- source include/rpl_end.inc diff --git a/storage/tokudb/mysql-test/rpl/t/rpl_truncate_3tokudb.test b/storage/tokudb/mysql-test/rpl/t/rpl_truncate_3tokudb.test index fb2fdaad098..8e535b9145c 100644 --- a/storage/tokudb/mysql-test/rpl/t/rpl_truncate_3tokudb.test +++ b/storage/tokudb/mysql-test/rpl/t/rpl_truncate_3tokudb.test @@ -1,3 +1,3 @@ --source include/have_tokudb.inc let $engine=TokuDB; ---source extra/rpl_tests/rpl_truncate.test +--source suite/rpl/include/rpl_truncate.test |