From 071a14c93dc8cff6d112092b4f37931dde74aaea Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 6 Aug 2014 13:31:55 +0200 Subject: [PATCH] cleanup: remove have_mysql_upgrade.inc --- mysql-test/include/have_mysql_upgrade.inc | 4 ---- mysql-test/include/mysql_upgrade_preparation.inc | 7 ------- mysql-test/r/have_mysql_upgrade.result | 2 -- mysql-test/suite/rpl/t/rpl_mysql_upgrade.test | 6 ++---- mysql-test/t/log_tables_upgrade.test | 8 +------- 5 files changed, 3 insertions(+), 24 deletions(-) delete mode 100644 mysql-test/include/have_mysql_upgrade.inc delete mode 100644 mysql-test/r/have_mysql_upgrade.result diff --git a/mysql-test/include/have_mysql_upgrade.inc b/mysql-test/include/have_mysql_upgrade.inc deleted file mode 100644 index 8f486176018..00000000000 --- a/mysql-test/include/have_mysql_upgrade.inc +++ /dev/null @@ -1,4 +0,0 @@ ---require r/have_mysql_upgrade.result ---disable_query_log -select LENGTH("$MYSQL_UPGRADE")>0 as have_mysql_upgrade; ---enable_query_log diff --git a/mysql-test/include/mysql_upgrade_preparation.inc b/mysql-test/include/mysql_upgrade_preparation.inc index a3c81c4c1e7..03019ae29ff 100644 --- a/mysql-test/include/mysql_upgrade_preparation.inc +++ b/mysql-test/include/mysql_upgrade_preparation.inc @@ -2,13 +2,6 @@ # Can't run test of external client with embedded server -- source include/not_embedded.inc - -# Only run test if "mysql_upgrade" is found ---require r/have_mysql_upgrade.result ---disable_query_log -select LENGTH("$MYSQL_UPGRADE")>0 as have_mysql_upgrade; ---enable_query_log - # # Hack: # diff --git a/mysql-test/r/have_mysql_upgrade.result b/mysql-test/r/have_mysql_upgrade.result deleted file mode 100644 index 952bea420f9..00000000000 --- a/mysql-test/r/have_mysql_upgrade.result +++ /dev/null @@ -1,2 +0,0 @@ -have_mysql_upgrade -1 diff --git a/mysql-test/suite/rpl/t/rpl_mysql_upgrade.test b/mysql-test/suite/rpl/t/rpl_mysql_upgrade.test index 398768e87bf..e99a233ac34 100644 --- a/mysql-test/suite/rpl/t/rpl_mysql_upgrade.test +++ b/mysql-test/suite/rpl/t/rpl_mysql_upgrade.test @@ -5,11 +5,9 @@ # options are added into mysql_upgrade. These options control whether sql # statements are binlogged or not. ############################################################################# ---source include/master-slave.inc --source include/have_innodb.inc - -# Only run test if "mysql_upgrade" is found ---source include/have_mysql_upgrade.inc +--source include/mysql_upgrade_preparation.inc +--source include/master-slave.inc call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); call mtr.add_suppression("table or database name 'mysqltest-1'"); diff --git a/mysql-test/t/log_tables_upgrade.test b/mysql-test/t/log_tables_upgrade.test index feb2d8c4aa9..d08d74174db 100644 --- a/mysql-test/t/log_tables_upgrade.test +++ b/mysql-test/t/log_tables_upgrade.test @@ -1,12 +1,6 @@ ---source include/not_embedded.inc --source include/have_csv.inc --source include/have_innodb.inc - -# Only run test if "mysql_upgrade" is found ---require r/have_mysql_upgrade.result ---disable_query_log -select LENGTH("$MYSQL_UPGRADE")>0 as have_mysql_upgrade; ---enable_query_log +--source include/mysql_upgrade_preparation.inc --echo # --echo # Bug#49823: mysql_upgrade fatal error due to general_log / slow_low CSV NULL