cleanup: remove have_mysql_upgrade.inc

This commit is contained in:
Sergei Golubchik 2014-08-06 13:31:55 +02:00
parent 15a9103c48
commit 071a14c93d
5 changed files with 3 additions and 24 deletions

View File

@ -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

View File

@ -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:
#

View File

@ -1,2 +0,0 @@
have_mysql_upgrade
1

View File

@ -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'");

View File

@ -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