From 7c7de142a3816c787d82aa0be42a410c18880466 Mon Sep 17 00:00:00 2001 From: Shivji Kumar Jha Date: Tue, 30 Oct 2012 10:40:07 +0530 Subject: [PATCH] BUG#14659685 - main.mysqlbinlog_row_myisam and main.mysqlbinlog_row_innodb are skipped by mtr === Problem === The following tests are wrongly placed in main suite and as a result these are not run with proper binlog format combinations. Some are always skipped by mtr. 1) mysqlbinlog_row_myisam 2) mysqlbinlog_row_innodb 3) mysqlbinlog_row.test 4) mysqlbinlog_row_trans.test 5) mysqlbinlog-cp932 6) mysqlbinlog2 7) mysqlbinlog_base64 === Background === mtr runs the tests placed in main suite with binlog format=stmt. Those that need to be tested against binlog format=row or mixed or more than one binlog format and require only one mysql server are placed in binlog suite. mtr runs tests in binlog suite with all three binlog formats(stmt,row and mixed). === Fix === 1) Moved the test listed in problem section above to binlog suite. 2) Added prefix "binlog_" to the name of each test case moved. Renamed the coresponding result files and option files accordingly. mysql-test/extra/binlog_tests/mysqlbinlog_row_engine.inc: include file for mysqlbinlog_row_myisam.test and mysqlbinlog_row_myisam.test which are being moved to binlog suite. mysql-test/suite/binlog/r/binlog_mysqlbinlog-cp932.result: result file for mysqlbinlog-cp932.test which is being moved to binlog suite. mysql-test/suite/binlog/r/binlog_mysqlbinlog2.result: result file for mysqlbinlog2.test which is being moved to binlog suite. mysql-test/suite/binlog/r/binlog_mysqlbinlog_base64.result: result file for mysqlbinlog_base64.test which is being moved to binlog suite. mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result: result file for mysqlbinlog_row.test which is being moved to binlog suite. mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result: result file for mysqlbinlog_row_innodb.test which is being moved to binlog suite. mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result: result file for mysqlbinlog_row_myisam.test which is being moved to binlog suite. mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result: result file for mysqlbinlog_row_trans.test which is being moved to binlog suite. mysql-test/suite/binlog/t/binlog_mysqlbinlog-cp932-master.opt: option file for mysqlbinlog-cp932.test which is being moved to binlog suite. mysql-test/suite/binlog/t/binlog_mysqlbinlog-cp932.test: the test requires binlog format=stmt or mixed. Since, it was placed in main suite earlier, it was only run with binlog format=stmt, and hence this test was never run with binlog format=mixed. mysql-test/suite/binlog/t/binlog_mysqlbinlog2.test: the test requires binlog format=stmt or mixed. Since, it was placed in main suite earlier, it was only run with binlog format=stmt, and hence this test was never run with binlog format=mixed. mysql-test/suite/binlog/t/binlog_mysqlbinlog_base64.test: the test requires binlog format=row. Since, it was placed in main suite earlier, it was only run with binlog format=stmt, and hence this test was always skipped by mtr. mysql-test/suite/binlog/t/binlog_mysqlbinlog_row.test: the test requires binlog format=row. Since, it was placed in main suite earlier, it was only run with binlog format=stmt, and hence this test was always skipped by mtr. mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_innodb.test: the test requires binlog format=row. Since, it was placed in main suite earlier, it was only run with binlog format=stmt, and hence this test was always skipped by mtr. mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_myisam.test: the test requires binlog format=row. Since, it was placed in main suite earlier, it was only run with binlog format=stmt, and hence this test was always skipped by mtr. mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_trans.test: the test requires binlog format=row. Since, it was placed in main suite earlier, it was only run with binlog format=stmt, and hence this test was always skipped by mtr. --- .../{include => extra/binlog_tests}/mysqlbinlog_row_engine.inc | 0 .../binlog/r/binlog_mysqlbinlog-cp932.result} | 0 .../binlog/r/binlog_mysqlbinlog2.result} | 0 .../binlog/r/binlog_mysqlbinlog_base64.result} | 0 .../binlog/r/binlog_mysqlbinlog_row.result} | 0 .../binlog/r/binlog_mysqlbinlog_row_innodb.result} | 0 .../binlog/r/binlog_mysqlbinlog_row_myisam.result} | 0 .../binlog/r/binlog_mysqlbinlog_row_trans.result} | 0 .../binlog/t/binlog_mysqlbinlog-cp932-master.opt} | 0 .../binlog/t/binlog_mysqlbinlog-cp932.test} | 0 .../binlog/t/binlog_mysqlbinlog2.test} | 0 .../binlog/t/binlog_mysqlbinlog_base64.test} | 0 .../binlog/t/binlog_mysqlbinlog_row.test} | 0 .../binlog/t/binlog_mysqlbinlog_row_innodb.test} | 2 +- .../binlog/t/binlog_mysqlbinlog_row_myisam.test} | 2 +- .../binlog/t/binlog_mysqlbinlog_row_trans.test} | 0 16 files changed, 2 insertions(+), 2 deletions(-) rename mysql-test/{include => extra/binlog_tests}/mysqlbinlog_row_engine.inc (100%) rename mysql-test/{r/mysqlbinlog-cp932.result => suite/binlog/r/binlog_mysqlbinlog-cp932.result} (100%) rename mysql-test/{r/mysqlbinlog2.result => suite/binlog/r/binlog_mysqlbinlog2.result} (100%) rename mysql-test/{r/mysqlbinlog_base64.result => suite/binlog/r/binlog_mysqlbinlog_base64.result} (100%) rename mysql-test/{r/mysqlbinlog_row.result => suite/binlog/r/binlog_mysqlbinlog_row.result} (100%) rename mysql-test/{r/mysqlbinlog_row_innodb.result => suite/binlog/r/binlog_mysqlbinlog_row_innodb.result} (100%) rename mysql-test/{r/mysqlbinlog_row_myisam.result => suite/binlog/r/binlog_mysqlbinlog_row_myisam.result} (100%) rename mysql-test/{r/mysqlbinlog_row_trans.result => suite/binlog/r/binlog_mysqlbinlog_row_trans.result} (100%) rename mysql-test/{t/mysqlbinlog-cp932-master.opt => suite/binlog/t/binlog_mysqlbinlog-cp932-master.opt} (100%) rename mysql-test/{t/mysqlbinlog-cp932.test => suite/binlog/t/binlog_mysqlbinlog-cp932.test} (100%) rename mysql-test/{t/mysqlbinlog2.test => suite/binlog/t/binlog_mysqlbinlog2.test} (100%) rename mysql-test/{t/mysqlbinlog_base64.test => suite/binlog/t/binlog_mysqlbinlog_base64.test} (100%) rename mysql-test/{t/mysqlbinlog_row.test => suite/binlog/t/binlog_mysqlbinlog_row.test} (100%) rename mysql-test/{t/mysqlbinlog_row_innodb.test => suite/binlog/t/binlog_mysqlbinlog_row_innodb.test} (91%) rename mysql-test/{t/mysqlbinlog_row_myisam.test => suite/binlog/t/binlog_mysqlbinlog_row_myisam.test} (91%) rename mysql-test/{t/mysqlbinlog_row_trans.test => suite/binlog/t/binlog_mysqlbinlog_row_trans.test} (100%) diff --git a/mysql-test/include/mysqlbinlog_row_engine.inc b/mysql-test/extra/binlog_tests/mysqlbinlog_row_engine.inc similarity index 100% rename from mysql-test/include/mysqlbinlog_row_engine.inc rename to mysql-test/extra/binlog_tests/mysqlbinlog_row_engine.inc diff --git a/mysql-test/r/mysqlbinlog-cp932.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog-cp932.result similarity index 100% rename from mysql-test/r/mysqlbinlog-cp932.result rename to mysql-test/suite/binlog/r/binlog_mysqlbinlog-cp932.result diff --git a/mysql-test/r/mysqlbinlog2.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog2.result similarity index 100% rename from mysql-test/r/mysqlbinlog2.result rename to mysql-test/suite/binlog/r/binlog_mysqlbinlog2.result diff --git a/mysql-test/r/mysqlbinlog_base64.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_base64.result similarity index 100% rename from mysql-test/r/mysqlbinlog_base64.result rename to mysql-test/suite/binlog/r/binlog_mysqlbinlog_base64.result diff --git a/mysql-test/r/mysqlbinlog_row.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result similarity index 100% rename from mysql-test/r/mysqlbinlog_row.result rename to mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result diff --git a/mysql-test/r/mysqlbinlog_row_innodb.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result similarity index 100% rename from mysql-test/r/mysqlbinlog_row_innodb.result rename to mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result diff --git a/mysql-test/r/mysqlbinlog_row_myisam.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result similarity index 100% rename from mysql-test/r/mysqlbinlog_row_myisam.result rename to mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result diff --git a/mysql-test/r/mysqlbinlog_row_trans.result b/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result similarity index 100% rename from mysql-test/r/mysqlbinlog_row_trans.result rename to mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result diff --git a/mysql-test/t/mysqlbinlog-cp932-master.opt b/mysql-test/suite/binlog/t/binlog_mysqlbinlog-cp932-master.opt similarity index 100% rename from mysql-test/t/mysqlbinlog-cp932-master.opt rename to mysql-test/suite/binlog/t/binlog_mysqlbinlog-cp932-master.opt diff --git a/mysql-test/t/mysqlbinlog-cp932.test b/mysql-test/suite/binlog/t/binlog_mysqlbinlog-cp932.test similarity index 100% rename from mysql-test/t/mysqlbinlog-cp932.test rename to mysql-test/suite/binlog/t/binlog_mysqlbinlog-cp932.test diff --git a/mysql-test/t/mysqlbinlog2.test b/mysql-test/suite/binlog/t/binlog_mysqlbinlog2.test similarity index 100% rename from mysql-test/t/mysqlbinlog2.test rename to mysql-test/suite/binlog/t/binlog_mysqlbinlog2.test diff --git a/mysql-test/t/mysqlbinlog_base64.test b/mysql-test/suite/binlog/t/binlog_mysqlbinlog_base64.test similarity index 100% rename from mysql-test/t/mysqlbinlog_base64.test rename to mysql-test/suite/binlog/t/binlog_mysqlbinlog_base64.test diff --git a/mysql-test/t/mysqlbinlog_row.test b/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row.test similarity index 100% rename from mysql-test/t/mysqlbinlog_row.test rename to mysql-test/suite/binlog/t/binlog_mysqlbinlog_row.test diff --git a/mysql-test/t/mysqlbinlog_row_innodb.test b/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_innodb.test similarity index 91% rename from mysql-test/t/mysqlbinlog_row_innodb.test rename to mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_innodb.test index cef1a712f7d..e8ba283807b 100644 --- a/mysql-test/t/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 include/mysqlbinlog_row_engine.inc +--source extra/binlog_tests/mysqlbinlog_row_engine.inc diff --git a/mysql-test/t/mysqlbinlog_row_myisam.test b/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_myisam.test similarity index 91% rename from mysql-test/t/mysqlbinlog_row_myisam.test rename to mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_myisam.test index e7b0335812a..9b941282399 100644 --- a/mysql-test/t/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 include/mysqlbinlog_row_engine.inc +--source extra/binlog_tests/mysqlbinlog_row_engine.inc diff --git a/mysql-test/t/mysqlbinlog_row_trans.test b/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_trans.test similarity index 100% rename from mysql-test/t/mysqlbinlog_row_trans.test rename to mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_trans.test