Commit 071a14c9 authored by Sergei Golubchik's avatar Sergei Golubchik

cleanup: remove have_mysql_upgrade.inc

parent 15a9103c
--require r/have_mysql_upgrade.result
--disable_query_log
select LENGTH("$MYSQL_UPGRADE")>0 as have_mysql_upgrade;
--enable_query_log
...@@ -2,13 +2,6 @@ ...@@ -2,13 +2,6 @@
# Can't run test of external client with embedded server # Can't run test of external client with embedded server
-- source include/not_embedded.inc -- 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: # Hack:
# #
......
...@@ -5,11 +5,9 @@ ...@@ -5,11 +5,9 @@
# options are added into mysql_upgrade. These options control whether sql # options are added into mysql_upgrade. These options control whether sql
# statements are binlogged or not. # statements are binlogged or not.
############################################################################# #############################################################################
--source include/master-slave.inc
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/mysql_upgrade_preparation.inc
# Only run test if "mysql_upgrade" is found --source include/master-slave.inc
--source include/have_mysql_upgrade.inc
call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); 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'"); call mtr.add_suppression("table or database name 'mysqltest-1'");
......
--source include/not_embedded.inc
--source include/have_csv.inc --source include/have_csv.inc
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/mysql_upgrade_preparation.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
--echo # --echo #
--echo # Bug#49823: mysql_upgrade fatal error due to general_log / slow_low CSV NULL --echo # Bug#49823: mysql_upgrade fatal error due to general_log / slow_low CSV NULL
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment