Move mysql-test-run/extra/binlog to suite/binlog/include

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

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

mysql-test/extra/binlog_tests/binlog.test → 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

mysql-test/extra/binlog_tests/binlog_incident.inc → mysql-test/suite/binlog/include/binlog_incident.inc

@@ -9,7 +9,7 @@
 # --let $binlog_start_pos= <binlog position> # optional
 # --let $binlog_file= <binlog filename>      # 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,

mysql-test/extra/binlog_tests/binlog_mysqlbinlog-cp932.inc → 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 

mysql-test/extra/binlog_tests/binlog_row_annotate.inc → 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

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;

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;

mysql-test/suite/binlog/t/binlog_incident.test

---source extra/binlog_tests/binlog_incident.inc
+--source include/binlog_incident.inc

mysql-test/suite/binlog/t/binlog_index.test

---source extra/binlog_tests/binlog_index.inc
+--source include/binlog_index.inc

mysql-test/suite/binlog/t/binlog_ioerr.test

---source extra/binlog_tests/binlog_ioerr.inc
+--source include/binlog_ioerr.inc

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

mysql-test/suite/binlog/t/binlog_mysqlbinlog-cp932.test

---source extra/binlog_tests/binlog_mysqlbinlog-cp932.inc
+--source include/binlog_mysqlbinlog-cp932.inc

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
 

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

mysql-test/suite/binlog/t/binlog_row_annotate.test

---source extra/binlog_tests/binlog_row_annotate.inc
+--source include/binlog_row_annotate.inc

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

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

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

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
 

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

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

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

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

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

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

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

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

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

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
 

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

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

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

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;
 
 

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;

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;

mysql-test/suite/binlog/t/binlog_write_error.test

---source extra/binlog_tests/binlog_write_error.inc
+--source include/binlog_write_error.inc

mysql-test/suite/binlog/t/binlog_xa_recover.test

---source extra/binlog_tests/binlog_xa_recover.inc
+--source include/binlog_xa_recover.inc

mysql-test/suite/binlog_encryption/binlog_incident.test

 --let $use_remote_mysqlbinlog= 1
---source extra/binlog_tests/binlog_incident.inc
+--source suite/binlog/include/binlog_incident.inc

mysql-test/suite/binlog_encryption/binlog_index.test

---source extra/binlog_tests/binlog_index.inc
+--source suite/binlog/include/binlog_index.inc

mysql-test/suite/binlog_encryption/binlog_ioerr.test

---source extra/binlog_tests/binlog_ioerr.inc
+--source suite/binlog/include/binlog_ioerr.inc

mysql-test/suite/binlog_encryption/binlog_mysqlbinlog-cp932.test

 --let $use_remote_mysqlbinlog= 1
---source extra/binlog_tests/binlog_mysqlbinlog-cp932.inc
+--source suite/binlog/include/binlog_mysqlbinlog-cp932.inc

mysql-test/suite/binlog_encryption/binlog_row_annotate.test

 --let $use_remote_mysqlbinlog= 1
---source extra/binlog_tests/binlog_row_annotate.inc
+--source suite/binlog/include/binlog_row_annotate.inc

mysql-test/suite/binlog_encryption/binlog_write_error.test

---source extra/binlog_tests/binlog_write_error.inc
+--source suite/binlog/include/binlog_write_error.inc

mysql-test/suite/binlog_encryption/binlog_xa_recover.test

---source extra/binlog_tests/binlog_xa_recover.inc
+--source suite/binlog/include/binlog_xa_recover.inc