diff --git a/mysql-test/main/ctype_cp932_binlog_row.test b/mysql-test/main/ctype_cp932_binlog_row.test index 38614ea45c0..1f7729cff9c 100644 --- a/mysql-test/main/ctype_cp932_binlog_row.test +++ b/mysql-test/main/ctype_cp932_binlog_row.test @@ -2,4 +2,4 @@ # For both statement and row based bin logs 11/07/2005 [jbm] -- source include/have_binlog_format_row.inc --- source extra/binlog_tests/ctype_cp932_binlog.test +-- source suite/binlog/include/ctype_cp932_binlog.test diff --git a/mysql-test/main/ctype_cp932_binlog_stm.test b/mysql-test/main/ctype_cp932_binlog_stm.test index 78e5725218a..5682ae6227f 100644 --- a/mysql-test/main/ctype_cp932_binlog_stm.test +++ b/mysql-test/main/ctype_cp932_binlog_stm.test @@ -2,7 +2,7 @@ # For both statement and row based bin logs 11/07/2005 [jbm] -- source include/have_binlog_format_mixed_or_statement.inc --- source extra/binlog_tests/ctype_cp932_binlog.test +-- source suite/binlog/include/ctype_cp932_binlog.test call mtr.add_suppression('Error in Log_event::read_log_event()'); --disable_query_log diff --git a/mysql-test/extra/binlog_tests/binlog.test b/mysql-test/suite/binlog/include/binlog.test similarity index 99% rename from mysql-test/extra/binlog_tests/binlog.test rename to mysql-test/suite/binlog/include/binlog.test index 810a402580c..92fcb3a792b 100644 --- a/mysql-test/extra/binlog_tests/binlog.test +++ b/mysql-test/suite/binlog/include/binlog.test @@ -281,7 +281,7 @@ use test; source include/show_binlog_events.inc; drop table t1,t2,t3,tt1; --- source extra/binlog_tests/binlog_insert_delayed.test +-- source suite/binlog/include/binlog_insert_delayed.test #Bug #26079 max_binlog_size + innodb = not make new binlog and hang server # server should not hang, binlog must rotate in the end diff --git a/mysql-test/extra/binlog_tests/binlog_cache_stat.test b/mysql-test/suite/binlog/include/binlog_cache_stat.test similarity index 100% rename from mysql-test/extra/binlog_tests/binlog_cache_stat.test rename to mysql-test/suite/binlog/include/binlog_cache_stat.test diff --git a/mysql-test/extra/binlog_tests/binlog_incident-master.opt b/mysql-test/suite/binlog/include/binlog_incident-master.opt similarity index 100% rename from mysql-test/extra/binlog_tests/binlog_incident-master.opt rename to mysql-test/suite/binlog/include/binlog_incident-master.opt diff --git a/mysql-test/extra/binlog_tests/binlog_incident.inc b/mysql-test/suite/binlog/include/binlog_incident.inc similarity index 97% rename from mysql-test/extra/binlog_tests/binlog_incident.inc rename to mysql-test/suite/binlog/include/binlog_incident.inc index 8ec67746f26..dd37a58628a 100644 --- a/mysql-test/extra/binlog_tests/binlog_incident.inc +++ b/mysql-test/suite/binlog/include/binlog_incident.inc @@ -9,7 +9,7 @@ # --let $binlog_start_pos= # optional # --let $binlog_file= # optional # -# --source extra/binlog_tests/binlog_incident.inc +# --source suite/binlog/include/binlog_incident.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/binlog_tests/binlog_index.inc b/mysql-test/suite/binlog/include/binlog_index.inc similarity index 100% rename from mysql-test/extra/binlog_tests/binlog_index.inc rename to mysql-test/suite/binlog/include/binlog_index.inc diff --git a/mysql-test/extra/binlog_tests/binlog_insert_delayed.test b/mysql-test/suite/binlog/include/binlog_insert_delayed.test similarity index 100% rename from mysql-test/extra/binlog_tests/binlog_insert_delayed.test rename to mysql-test/suite/binlog/include/binlog_insert_delayed.test diff --git a/mysql-test/extra/binlog_tests/binlog_ioerr.inc b/mysql-test/suite/binlog/include/binlog_ioerr.inc similarity index 100% rename from mysql-test/extra/binlog_tests/binlog_ioerr.inc rename to mysql-test/suite/binlog/include/binlog_ioerr.inc diff --git a/mysql-test/extra/binlog_tests/binlog_mysqlbinlog-cp932.inc b/mysql-test/suite/binlog/include/binlog_mysqlbinlog-cp932.inc similarity index 96% rename from mysql-test/extra/binlog_tests/binlog_mysqlbinlog-cp932.inc rename to mysql-test/suite/binlog/include/binlog_mysqlbinlog-cp932.inc index ac637b2da03..3646c34b027 100644 --- a/mysql-test/extra/binlog_tests/binlog_mysqlbinlog-cp932.inc +++ b/mysql-test/suite/binlog/include/binlog_mysqlbinlog-cp932.inc @@ -5,7 +5,7 @@ # # Usage: # --let $use_remote_mysqlbinlog= 1 # optional -# --source extra/binlog_tests/binlog_mysqlbinlog-cp932.inc +# --source suite/binlog/include/binlog_mysqlbinlog-cp932.inc # # By default, the script calls mysqlbinlog to read binary logs directly. # If it is undesirable, this behavior can be overridden by setting diff --git a/mysql-test/extra/binlog_tests/binlog_row_annotate.inc b/mysql-test/suite/binlog/include/binlog_row_annotate.inc similarity index 99% rename from mysql-test/extra/binlog_tests/binlog_row_annotate.inc rename to mysql-test/suite/binlog/include/binlog_row_annotate.inc index e53f49149f1..a5fdba8daf2 100644 --- a/mysql-test/extra/binlog_tests/binlog_row_annotate.inc +++ b/mysql-test/suite/binlog/include/binlog_row_annotate.inc @@ -5,7 +5,7 @@ # # Usage: # --let use_remote_mysqlbinlog= 1 # optional -# --source extra/binlog_tests/binlog_row_annotate.inc +# --source suite/binlog/include/binlog_row_annotate.inc # # By default, the script uses mysqlbinlog both with direct access to files # and via connection to the server. In some cases, direct access to files diff --git a/mysql-test/extra/binlog_tests/binlog_truncate.test b/mysql-test/suite/binlog/include/binlog_truncate.test similarity index 100% rename from mysql-test/extra/binlog_tests/binlog_truncate.test rename to mysql-test/suite/binlog/include/binlog_truncate.test diff --git a/mysql-test/extra/binlog_tests/binlog_write_error.inc b/mysql-test/suite/binlog/include/binlog_write_error.inc similarity index 100% rename from mysql-test/extra/binlog_tests/binlog_write_error.inc rename to mysql-test/suite/binlog/include/binlog_write_error.inc diff --git a/mysql-test/extra/binlog_tests/binlog_xa_recover.inc b/mysql-test/suite/binlog/include/binlog_xa_recover.inc similarity index 100% rename from mysql-test/extra/binlog_tests/binlog_xa_recover.inc rename to mysql-test/suite/binlog/include/binlog_xa_recover.inc diff --git a/mysql-test/extra/binlog_tests/blackhole.test b/mysql-test/suite/binlog/include/blackhole.test similarity index 100% rename from mysql-test/extra/binlog_tests/blackhole.test rename to mysql-test/suite/binlog/include/blackhole.test diff --git a/mysql-test/extra/binlog_tests/ctype_cp932.test b/mysql-test/suite/binlog/include/ctype_cp932.test similarity index 100% rename from mysql-test/extra/binlog_tests/ctype_cp932.test rename to mysql-test/suite/binlog/include/ctype_cp932.test diff --git a/mysql-test/extra/binlog_tests/ctype_cp932_binlog.test b/mysql-test/suite/binlog/include/ctype_cp932_binlog.test similarity index 100% rename from mysql-test/extra/binlog_tests/ctype_cp932_binlog.test rename to mysql-test/suite/binlog/include/ctype_cp932_binlog.test diff --git a/mysql-test/extra/binlog_tests/ctype_ucs_binlog.result b/mysql-test/suite/binlog/include/ctype_ucs_binlog.result similarity index 100% rename from mysql-test/extra/binlog_tests/ctype_ucs_binlog.result rename to mysql-test/suite/binlog/include/ctype_ucs_binlog.result diff --git a/mysql-test/extra/binlog_tests/ctype_ucs_binlog.test b/mysql-test/suite/binlog/include/ctype_ucs_binlog.test similarity index 100% rename from mysql-test/extra/binlog_tests/ctype_ucs_binlog.test rename to mysql-test/suite/binlog/include/ctype_ucs_binlog.test diff --git a/mysql-test/extra/binlog_tests/database.test b/mysql-test/suite/binlog/include/database.test similarity index 100% rename from mysql-test/extra/binlog_tests/database.test rename to mysql-test/suite/binlog/include/database.test diff --git a/mysql-test/extra/binlog_tests/drop_table.test b/mysql-test/suite/binlog/include/drop_table.test similarity index 100% rename from mysql-test/extra/binlog_tests/drop_table.test rename to mysql-test/suite/binlog/include/drop_table.test diff --git a/mysql-test/extra/binlog_tests/drop_temp_table.test b/mysql-test/suite/binlog/include/drop_temp_table.test similarity index 100% rename from mysql-test/extra/binlog_tests/drop_temp_table.test rename to mysql-test/suite/binlog/include/drop_temp_table.test diff --git a/mysql-test/extra/binlog_tests/implicit.test b/mysql-test/suite/binlog/include/implicit.test similarity index 100% rename from mysql-test/extra/binlog_tests/implicit.test rename to mysql-test/suite/binlog/include/implicit.test diff --git a/mysql-test/extra/binlog_tests/insert_select-binlog.test b/mysql-test/suite/binlog/include/insert_select-binlog.test similarity index 100% rename from mysql-test/extra/binlog_tests/insert_select-binlog.test rename to mysql-test/suite/binlog/include/insert_select-binlog.test diff --git a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test b/mysql-test/suite/binlog/include/mix_innodb_myisam_binlog.test similarity index 100% rename from mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test rename to mysql-test/suite/binlog/include/mix_innodb_myisam_binlog.test diff --git a/mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test b/mysql-test/suite/binlog/include/mix_innodb_myisam_side_effects.test similarity index 100% rename from mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test rename to mysql-test/suite/binlog/include/mix_innodb_myisam_side_effects.test diff --git a/mysql-test/extra/binlog_tests/mysqlbinlog_row_engine.inc b/mysql-test/suite/binlog/include/mysqlbinlog_row_engine.inc similarity index 100% rename from mysql-test/extra/binlog_tests/mysqlbinlog_row_engine.inc rename to mysql-test/suite/binlog/include/mysqlbinlog_row_engine.inc diff --git a/mysql-test/suite/binlog/t/binlog_database.test b/mysql-test/suite/binlog/t/binlog_database.test index 9c2a43575fc..8d298b8ae7f 100644 --- a/mysql-test/suite/binlog/t/binlog_database.test +++ b/mysql-test/suite/binlog/t/binlog_database.test @@ -6,10 +6,10 @@ --source include/have_binlog_format_statement.inc set binlog_format=statement; -source extra/binlog_tests/database.test; +source include/database.test; set binlog_format=mixed; -source extra/binlog_tests/database.test; +source include/database.test; set binlog_format=row; -source extra/binlog_tests/database.test; +source include/database.test; show databases; diff --git a/mysql-test/suite/binlog/t/binlog_implicit_commit.test b/mysql-test/suite/binlog/t/binlog_implicit_commit.test index a682ab95e3d..11ceae5f8d2 100644 --- a/mysql-test/suite/binlog/t/binlog_implicit_commit.test +++ b/mysql-test/suite/binlog/t/binlog_implicit_commit.test @@ -15,36 +15,36 @@ let $cleanup = COMMIT; let $prepare = SET AUTOCOMMIT = 0; let $statement = SET AUTOCOMMIT = 1; -source extra/binlog_tests/implicit.test; +source include/implicit.test; let $prepare = SET AUTOCOMMIT = 1; let $statement = SET AUTOCOMMIT = 1; -source extra/binlog_tests/implicit.test; +source include/implicit.test; let $prepare = SET AUTOCOMMIT = 0; let $statement = SET AUTOCOMMIT = 0; -source extra/binlog_tests/implicit.test; +source include/implicit.test; let $prepare = SET AUTOCOMMIT = 1; let $statement = SET AUTOCOMMIT = 0; -source extra/binlog_tests/implicit.test; +source include/implicit.test; SET BINLOG_FORMAT = ROW; let $prepare = SET AUTOCOMMIT = 0; let $statement = SET AUTOCOMMIT = 1; -source extra/binlog_tests/implicit.test; +source include/implicit.test; let $prepare = SET AUTOCOMMIT = 1; let $statement = SET AUTOCOMMIT = 1; -source extra/binlog_tests/implicit.test; +source include/implicit.test; let $prepare = SET AUTOCOMMIT = 0; let $statement = SET AUTOCOMMIT = 0; -source extra/binlog_tests/implicit.test; +source include/implicit.test; let $prepare = SET AUTOCOMMIT = 1; let $statement = SET AUTOCOMMIT = 0; -source extra/binlog_tests/implicit.test; +source include/implicit.test; RESET MASTER; SET AUTOCOMMIT = 0; diff --git a/mysql-test/suite/binlog/t/binlog_incident.test b/mysql-test/suite/binlog/t/binlog_incident.test index c4270a074f0..de7abf20a95 100644 --- a/mysql-test/suite/binlog/t/binlog_incident.test +++ b/mysql-test/suite/binlog/t/binlog_incident.test @@ -1 +1 @@ ---source extra/binlog_tests/binlog_incident.inc +--source include/binlog_incident.inc diff --git a/mysql-test/suite/binlog/t/binlog_index.test b/mysql-test/suite/binlog/t/binlog_index.test index 1837c683bba..a7c4ce8feee 100644 --- a/mysql-test/suite/binlog/t/binlog_index.test +++ b/mysql-test/suite/binlog/t/binlog_index.test @@ -1 +1 @@ ---source extra/binlog_tests/binlog_index.inc +--source include/binlog_index.inc diff --git a/mysql-test/suite/binlog/t/binlog_ioerr.test b/mysql-test/suite/binlog/t/binlog_ioerr.test index 3155e14e6b0..e75adb19172 100644 --- a/mysql-test/suite/binlog/t/binlog_ioerr.test +++ b/mysql-test/suite/binlog/t/binlog_ioerr.test @@ -1 +1 @@ ---source extra/binlog_tests/binlog_ioerr.inc +--source include/binlog_ioerr.inc diff --git a/mysql-test/suite/binlog/t/binlog_mixed_cache_stat.test b/mysql-test/suite/binlog/t/binlog_mixed_cache_stat.test index 3e63fb3bc9c..f22ea65d9a0 100644 --- a/mysql-test/suite/binlog/t/binlog_mixed_cache_stat.test +++ b/mysql-test/suite/binlog/t/binlog_mixed_cache_stat.test @@ -2,4 +2,4 @@ # For both statement and row based bin logs 9/19/2005 [jbm] -- source include/have_binlog_format_mixed.inc --- source extra/binlog_tests/binlog_cache_stat.test +-- source include/binlog_cache_stat.test diff --git a/mysql-test/suite/binlog/t/binlog_mysqlbinlog-cp932.test b/mysql-test/suite/binlog/t/binlog_mysqlbinlog-cp932.test index 58c4befa8d6..80710261ef4 100644 --- a/mysql-test/suite/binlog/t/binlog_mysqlbinlog-cp932.test +++ b/mysql-test/suite/binlog/t/binlog_mysqlbinlog-cp932.test @@ -1 +1 @@ ---source extra/binlog_tests/binlog_mysqlbinlog-cp932.inc +--source include/binlog_mysqlbinlog-cp932.inc diff --git a/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_innodb.test b/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_innodb.test index e8ba283807b..cef1a712f7d 100644 --- a/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_innodb.test +++ b/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_innodb.test @@ -20,5 +20,5 @@ let $engine_type=InnoDB; --source include/have_binlog_format_row.inc --source include/have_ucs2.inc ---source extra/binlog_tests/mysqlbinlog_row_engine.inc +--source include/mysqlbinlog_row_engine.inc diff --git a/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_myisam.test b/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_myisam.test index 9b941282399..e7b0335812a 100644 --- a/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_myisam.test +++ b/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_myisam.test @@ -20,4 +20,4 @@ let $engine_type=MyISAM; --source include/have_binlog_format_row.inc --source include/have_ucs2.inc ---source extra/binlog_tests/mysqlbinlog_row_engine.inc +--source include/mysqlbinlog_row_engine.inc diff --git a/mysql-test/suite/binlog/t/binlog_row_annotate.test b/mysql-test/suite/binlog/t/binlog_row_annotate.test index 569391e68ce..a6e5f8289c8 100644 --- a/mysql-test/suite/binlog/t/binlog_row_annotate.test +++ b/mysql-test/suite/binlog/t/binlog_row_annotate.test @@ -1 +1 @@ ---source extra/binlog_tests/binlog_row_annotate.inc +--source include/binlog_row_annotate.inc diff --git a/mysql-test/suite/binlog/t/binlog_row_binlog.test b/mysql-test/suite/binlog/t/binlog_row_binlog.test index 2bf4f93f332..14cc00a2326 100644 --- a/mysql-test/suite/binlog/t/binlog_row_binlog.test +++ b/mysql-test/suite/binlog/t/binlog_row_binlog.test @@ -4,4 +4,4 @@ -- source include/have_binlog_format_row.inc let collation=utf8_unicode_ci; --source include/have_collation.inc ---source extra/binlog_tests/binlog.test +--source include/binlog.test diff --git a/mysql-test/suite/binlog/t/binlog_row_cache_stat.test b/mysql-test/suite/binlog/t/binlog_row_cache_stat.test index 03f9c53f0cc..6f406119e38 100644 --- a/mysql-test/suite/binlog/t/binlog_row_cache_stat.test +++ b/mysql-test/suite/binlog/t/binlog_row_cache_stat.test @@ -2,4 +2,4 @@ # For both statement and row based bin logs 9/19/2005 [jbm] -- source include/have_binlog_format_row.inc --- source extra/binlog_tests/binlog_cache_stat.test +-- source include/binlog_cache_stat.test diff --git a/mysql-test/suite/binlog/t/binlog_row_ctype_cp932.test b/mysql-test/suite/binlog/t/binlog_row_ctype_cp932.test index 595af5a3114..b99afb6c728 100644 --- a/mysql-test/suite/binlog/t/binlog_row_ctype_cp932.test +++ b/mysql-test/suite/binlog/t/binlog_row_ctype_cp932.test @@ -2,4 +2,4 @@ # For both statement and row based bin logs 9/19/2005 [jbm] -- source include/have_binlog_format_row.inc --- source extra/binlog_tests/ctype_cp932.test +-- source include/ctype_cp932.test diff --git a/mysql-test/suite/binlog/t/binlog_row_ctype_ucs.test b/mysql-test/suite/binlog/t/binlog_row_ctype_ucs.test index 96e14ed8882..02a9b6478ce 100644 --- a/mysql-test/suite/binlog/t/binlog_row_ctype_ucs.test +++ b/mysql-test/suite/binlog/t/binlog_row_ctype_ucs.test @@ -2,5 +2,5 @@ # For both statement and row based bin logs 9/19/2005 [jbm] -- source include/have_binlog_format_row.inc --- source extra/binlog_tests/ctype_ucs_binlog.test +-- source include/ctype_ucs_binlog.test diff --git a/mysql-test/suite/binlog/t/binlog_row_drop_tbl.test b/mysql-test/suite/binlog/t/binlog_row_drop_tbl.test index 06854900612..828530652a5 100644 --- a/mysql-test/suite/binlog/t/binlog_row_drop_tbl.test +++ b/mysql-test/suite/binlog/t/binlog_row_drop_tbl.test @@ -2,4 +2,4 @@ # For both statement and row based bin logs -- source include/have_binlog_format_row.inc --- source extra/binlog_tests/drop_table.test +-- source include/drop_table.test diff --git a/mysql-test/suite/binlog/t/binlog_row_drop_tmp_tbl.test b/mysql-test/suite/binlog/t/binlog_row_drop_tmp_tbl.test index 5b503b78d85..e45e659c1d3 100644 --- a/mysql-test/suite/binlog/t/binlog_row_drop_tmp_tbl.test +++ b/mysql-test/suite/binlog/t/binlog_row_drop_tmp_tbl.test @@ -2,4 +2,4 @@ # For both statement and row based bin logs 9/19/2005 [jbm] -- source include/have_binlog_format_row.inc --- source extra/binlog_tests/drop_temp_table.test +-- source include/drop_temp_table.test diff --git a/mysql-test/suite/binlog/t/binlog_row_insert_select.test b/mysql-test/suite/binlog/t/binlog_row_insert_select.test index 806d495c8fb..e2a08536447 100644 --- a/mysql-test/suite/binlog/t/binlog_row_insert_select.test +++ b/mysql-test/suite/binlog/t/binlog_row_insert_select.test @@ -6,5 +6,5 @@ # The use of the ps protocol causes extra table maps in the binlog, so # we disable the ps-protocol for this statement. --disable_ps_protocol --- source extra/binlog_tests/insert_select-binlog.test +-- source include/insert_select-binlog.test --enable_ps_protocol diff --git a/mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test b/mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test index a7722075d6e..9692c6ee1c2 100644 --- a/mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test +++ b/mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test @@ -8,8 +8,8 @@ # we disable the ps-protocol for this statement. --disable_ps_protocol --- source extra/binlog_tests/mix_innodb_myisam_binlog.test +-- source include/mix_innodb_myisam_binlog.test --enable_ps_protocol --- source extra/binlog_tests/mix_innodb_myisam_side_effects.test +-- source include/mix_innodb_myisam_side_effects.test diff --git a/mysql-test/suite/binlog/t/binlog_statement_insert_delayed.test b/mysql-test/suite/binlog/t/binlog_statement_insert_delayed.test index 570a7440592..b2af560fa50 100644 --- a/mysql-test/suite/binlog/t/binlog_statement_insert_delayed.test +++ b/mysql-test/suite/binlog/t/binlog_statement_insert_delayed.test @@ -9,4 +9,4 @@ reset master; # get rid of previous tests binlog 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/binlog_tests/binlog_insert_delayed.test +-- source include/binlog_insert_delayed.test diff --git a/mysql-test/suite/binlog/t/binlog_stm_binlog.test b/mysql-test/suite/binlog/t/binlog_stm_binlog.test index 682b0a3bfa7..c3d8066f807 100644 --- a/mysql-test/suite/binlog/t/binlog_stm_binlog.test +++ b/mysql-test/suite/binlog/t/binlog_stm_binlog.test @@ -20,4 +20,4 @@ drop table t1; # This is a wrapper for binlog.test so that the same test case can be used # For both statement and row based bin logs 9/19/2005 [jbm] --- source extra/binlog_tests/binlog.test +-- source include/binlog.test diff --git a/mysql-test/suite/binlog/t/binlog_stm_blackhole.test b/mysql-test/suite/binlog/t/binlog_stm_blackhole.test index 6047d8ca2fc..9dea4d1b4d5 100644 --- a/mysql-test/suite/binlog/t/binlog_stm_blackhole.test +++ b/mysql-test/suite/binlog/t/binlog_stm_blackhole.test @@ -3,4 +3,4 @@ -- source include/not_embedded.inc -- source include/have_binlog_format_statement.inc --- source extra/binlog_tests/blackhole.test +-- source include/blackhole.test diff --git a/mysql-test/suite/binlog/t/binlog_stm_cache_stat.test b/mysql-test/suite/binlog/t/binlog_stm_cache_stat.test index 0f5aa9f6013..a03f4c54f5e 100644 --- a/mysql-test/suite/binlog/t/binlog_stm_cache_stat.test +++ b/mysql-test/suite/binlog/t/binlog_stm_cache_stat.test @@ -2,4 +2,4 @@ # For both statement and row based bin logs 9/19/2005 [jbm] -- source include/have_binlog_format_statement.inc --- source extra/binlog_tests/binlog_cache_stat.test +-- source include/binlog_cache_stat.test diff --git a/mysql-test/suite/binlog/t/binlog_stm_ctype_cp932.test b/mysql-test/suite/binlog/t/binlog_stm_ctype_cp932.test index c0791d81445..33378b28edf 100644 --- a/mysql-test/suite/binlog/t/binlog_stm_ctype_cp932.test +++ b/mysql-test/suite/binlog/t/binlog_stm_ctype_cp932.test @@ -3,4 +3,4 @@ -- source include/not_embedded.inc -- source include/have_binlog_format_mixed_or_statement.inc --- source extra/binlog_tests/ctype_cp932.test +-- source include/ctype_cp932.test diff --git a/mysql-test/suite/binlog/t/binlog_stm_ctype_ucs.test b/mysql-test/suite/binlog/t/binlog_stm_ctype_ucs.test index c8cd7e06398..ed5b899c033 100644 --- a/mysql-test/suite/binlog/t/binlog_stm_ctype_ucs.test +++ b/mysql-test/suite/binlog/t/binlog_stm_ctype_ucs.test @@ -2,5 +2,5 @@ # For both statement and row based bin logs 9/19/2005 [jbm] -- source include/have_binlog_format_mixed_or_statement.inc --- source extra/binlog_tests/ctype_ucs_binlog.test +-- source include/ctype_ucs_binlog.test diff --git a/mysql-test/suite/binlog/t/binlog_stm_drop_tbl.test b/mysql-test/suite/binlog/t/binlog_stm_drop_tbl.test index f2b07bb69f6..fb8b290a41e 100644 --- a/mysql-test/suite/binlog/t/binlog_stm_drop_tbl.test +++ b/mysql-test/suite/binlog/t/binlog_stm_drop_tbl.test @@ -2,4 +2,4 @@ # For both statement and row based bin logs -- source include/have_binlog_format_mixed_or_statement.inc --- source extra/binlog_tests/drop_table.test +-- source include/drop_table.test diff --git a/mysql-test/suite/binlog/t/binlog_stm_drop_tmp_tbl.test b/mysql-test/suite/binlog/t/binlog_stm_drop_tmp_tbl.test index 6017f272d01..201aa45b4c6 100644 --- a/mysql-test/suite/binlog/t/binlog_stm_drop_tmp_tbl.test +++ b/mysql-test/suite/binlog/t/binlog_stm_drop_tmp_tbl.test @@ -2,4 +2,4 @@ # For both statement and row based bin logs 9/19/2005 [jbm] -- source include/have_binlog_format_mixed_or_statement.inc --- source extra/binlog_tests/drop_temp_table.test +-- source include/drop_temp_table.test diff --git a/mysql-test/suite/binlog/t/binlog_stm_insert_select.test b/mysql-test/suite/binlog/t/binlog_stm_insert_select.test index 3aefa1e6cf7..d0782c70699 100644 --- a/mysql-test/suite/binlog/t/binlog_stm_insert_select.test +++ b/mysql-test/suite/binlog/t/binlog_stm_insert_select.test @@ -2,4 +2,4 @@ # For both statement and row based bin logs 9/19/2005 [jbm] -- source include/have_binlog_format_mixed_or_statement.inc --- source extra/binlog_tests/insert_select-binlog.test +-- source include/insert_select-binlog.test diff --git a/mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test b/mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test index ba3da73dead..911c90b5fff 100644 --- a/mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test +++ b/mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test @@ -5,10 +5,10 @@ CALL mtr.add_suppression("Statement may not be safe to log in statement format."); --- source extra/binlog_tests/mix_innodb_myisam_binlog.test +-- source include/mix_innodb_myisam_binlog.test set @@session.binlog_format=statement; --- source extra/binlog_tests/mix_innodb_myisam_side_effects.test +-- source include/mix_innodb_myisam_side_effects.test set @@session.binlog_format=@@global.binlog_format; diff --git a/mysql-test/suite/binlog/t/binlog_truncate_innodb.test b/mysql-test/suite/binlog/t/binlog_truncate_innodb.test index 56dd5bda505..54a32b96ef1 100644 --- a/mysql-test/suite/binlog/t/binlog_truncate_innodb.test +++ b/mysql-test/suite/binlog/t/binlog_truncate_innodb.test @@ -8,37 +8,37 @@ SET @old_binlog_format=@@binlog_format; SET BINLOG_FORMAT=ROW; RESET MASTER; -source extra/binlog_tests/binlog_truncate.test; +source include/binlog_truncate.test; --echo # Even though the isolation level might be permissive, truncate --echo # table follows a stricter isolation as its locking is based on --echo # (exclusive) metadata locks. let $before_truncate = SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED; -source extra/binlog_tests/binlog_truncate.test; +source include/binlog_truncate.test; let $before_truncate = SET TRANSACTION ISOLATION LEVEL READ COMMITTED; -source extra/binlog_tests/binlog_truncate.test; +source include/binlog_truncate.test; let $before_truncate = SET TRANSACTION ISOLATION LEVEL REPEATABLE READ; -source extra/binlog_tests/binlog_truncate.test; +source include/binlog_truncate.test; let $before_truncate = SET TRANSACTION ISOLATION LEVEL SERIALIZABLE; -source extra/binlog_tests/binlog_truncate.test; +source include/binlog_truncate.test; SET BINLOG_FORMAT=STATEMENT; RESET MASTER; -source extra/binlog_tests/binlog_truncate.test; +source include/binlog_truncate.test; --echo # Truncate is not supported for SBR if the isolation level is --echo # READ UNCOMMITTED or READ COMMITTED. These specific isolation --echo # levels are tested elsewhere. let $before_truncate = SET TRANSACTION ISOLATION LEVEL REPEATABLE READ; -source extra/binlog_tests/binlog_truncate.test; +source include/binlog_truncate.test; let $before_truncate = SET TRANSACTION ISOLATION LEVEL SERIALIZABLE; -source extra/binlog_tests/binlog_truncate.test; +source include/binlog_truncate.test; SET BINLOG_FORMAT=@old_binlog_format; diff --git a/mysql-test/suite/binlog/t/binlog_truncate_myisam.test b/mysql-test/suite/binlog/t/binlog_truncate_myisam.test index fc28bd7c7e2..864e9c63b10 100644 --- a/mysql-test/suite/binlog/t/binlog_truncate_myisam.test +++ b/mysql-test/suite/binlog/t/binlog_truncate_myisam.test @@ -7,11 +7,11 @@ let $engine = MyISAM; SET BINLOG_FORMAT=ROW; RESET MASTER; -source extra/binlog_tests/binlog_truncate.test; +source include/binlog_truncate.test; SET BINLOG_FORMAT=STATEMENT; RESET MASTER; -source extra/binlog_tests/binlog_truncate.test; +source include/binlog_truncate.test; SET BINLOG_FORMAT=@old_binlog_format; diff --git a/mysql-test/suite/binlog/t/binlog_write_error.test b/mysql-test/suite/binlog/t/binlog_write_error.test index 05f8eff6c3a..d66efb0bcf3 100644 --- a/mysql-test/suite/binlog/t/binlog_write_error.test +++ b/mysql-test/suite/binlog/t/binlog_write_error.test @@ -1 +1 @@ ---source extra/binlog_tests/binlog_write_error.inc +--source include/binlog_write_error.inc diff --git a/mysql-test/suite/binlog/t/binlog_xa_recover.test b/mysql-test/suite/binlog/t/binlog_xa_recover.test index 0e0b80433ff..411394d4bef 100644 --- a/mysql-test/suite/binlog/t/binlog_xa_recover.test +++ b/mysql-test/suite/binlog/t/binlog_xa_recover.test @@ -1 +1 @@ ---source extra/binlog_tests/binlog_xa_recover.inc +--source include/binlog_xa_recover.inc diff --git a/mysql-test/suite/binlog_encryption/binlog_incident.test b/mysql-test/suite/binlog_encryption/binlog_incident.test index d37ed3d552d..6fc599596f7 100644 --- a/mysql-test/suite/binlog_encryption/binlog_incident.test +++ b/mysql-test/suite/binlog_encryption/binlog_incident.test @@ -1,2 +1,2 @@ --let $use_remote_mysqlbinlog= 1 ---source extra/binlog_tests/binlog_incident.inc +--source suite/binlog/include/binlog_incident.inc diff --git a/mysql-test/suite/binlog_encryption/binlog_index.test b/mysql-test/suite/binlog_encryption/binlog_index.test index 1837c683bba..cd48a313809 100644 --- a/mysql-test/suite/binlog_encryption/binlog_index.test +++ b/mysql-test/suite/binlog_encryption/binlog_index.test @@ -1 +1 @@ ---source extra/binlog_tests/binlog_index.inc +--source suite/binlog/include/binlog_index.inc diff --git a/mysql-test/suite/binlog_encryption/binlog_ioerr.test b/mysql-test/suite/binlog_encryption/binlog_ioerr.test index 3155e14e6b0..e77ecd6d517 100644 --- a/mysql-test/suite/binlog_encryption/binlog_ioerr.test +++ b/mysql-test/suite/binlog_encryption/binlog_ioerr.test @@ -1 +1 @@ ---source extra/binlog_tests/binlog_ioerr.inc +--source suite/binlog/include/binlog_ioerr.inc diff --git a/mysql-test/suite/binlog_encryption/binlog_mysqlbinlog-cp932.test b/mysql-test/suite/binlog_encryption/binlog_mysqlbinlog-cp932.test index 3af0015a486..6232720b8e2 100644 --- a/mysql-test/suite/binlog_encryption/binlog_mysqlbinlog-cp932.test +++ b/mysql-test/suite/binlog_encryption/binlog_mysqlbinlog-cp932.test @@ -1,2 +1,2 @@ --let $use_remote_mysqlbinlog= 1 ---source extra/binlog_tests/binlog_mysqlbinlog-cp932.inc +--source suite/binlog/include/binlog_mysqlbinlog-cp932.inc diff --git a/mysql-test/suite/binlog_encryption/binlog_row_annotate.test b/mysql-test/suite/binlog_encryption/binlog_row_annotate.test index 40aa0dbc6e3..b5c3bb2e55e 100644 --- a/mysql-test/suite/binlog_encryption/binlog_row_annotate.test +++ b/mysql-test/suite/binlog_encryption/binlog_row_annotate.test @@ -1,2 +1,2 @@ --let $use_remote_mysqlbinlog= 1 ---source extra/binlog_tests/binlog_row_annotate.inc +--source suite/binlog/include/binlog_row_annotate.inc diff --git a/mysql-test/suite/binlog_encryption/binlog_write_error.test b/mysql-test/suite/binlog_encryption/binlog_write_error.test index 05f8eff6c3a..68e59655eab 100644 --- a/mysql-test/suite/binlog_encryption/binlog_write_error.test +++ b/mysql-test/suite/binlog_encryption/binlog_write_error.test @@ -1 +1 @@ ---source extra/binlog_tests/binlog_write_error.inc +--source suite/binlog/include/binlog_write_error.inc diff --git a/mysql-test/suite/binlog_encryption/binlog_xa_recover.test b/mysql-test/suite/binlog_encryption/binlog_xa_recover.test index 0e0b80433ff..e603ccc30fe 100644 --- a/mysql-test/suite/binlog_encryption/binlog_xa_recover.test +++ b/mysql-test/suite/binlog_encryption/binlog_xa_recover.test @@ -1 +1 @@ ---source extra/binlog_tests/binlog_xa_recover.inc +--source suite/binlog/include/binlog_xa_recover.inc