From 386ef08704de7b8070823e5519a530dad259fe11 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Mon, 13 Mar 2017 10:54:08 +0100
Subject: [PATCH] MDEV-12233 main.mysql_upgrade_noengine fails in buildbot on
 ppc64le

verify that tests don't leave mysql_upgrade_info in datadir
---
 mysql-test/include/check-testcase.test                | 4 ++++
 mysql-test/suite/perfschema/include/upgrade_check.inc | 1 +
 mysql-test/suite/rpl/t/rpl_mysql_upgrade.test         | 3 +++
 mysql-test/t/ctype_upgrade.test                       | 1 +
 mysql-test/t/log_tables_upgrade.test                  | 1 +
 mysql-test/t/mysql_upgrade_noengine.test              | 1 +
 mysql-test/t/mysql_upgrade_ssl.test                   | 3 ++-
 mysql-test/t/mysql_upgrade_view.test                  | 1 +
 mysql-test/t/plugin_auth.test                         | 2 ++
 9 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/mysql-test/include/check-testcase.test b/mysql-test/include/check-testcase.test
index 083f44ce966..20b5ded6e82 100644
--- a/mysql-test/include/check-testcase.test
+++ b/mysql-test/include/check-testcase.test
@@ -76,5 +76,9 @@ if (!$tmp) {
 }
 
 call mtr.check_testcase();
+
+let $datadir=`select @@datadir`;
+list_files $datadir mysql_upgrade_info;
+
 --enable_query_log
 
diff --git a/mysql-test/suite/perfschema/include/upgrade_check.inc b/mysql-test/suite/perfschema/include/upgrade_check.inc
index 327d63cc633..bb48f81decb 100644
--- a/mysql-test/suite/perfschema/include/upgrade_check.inc
+++ b/mysql-test/suite/perfschema/include/upgrade_check.inc
@@ -14,4 +14,5 @@
 --remove_file $out_file
 --error 0,1
 --remove_file $err_file
+--remove_file $MYSQLD_DATADIR/mysql_upgrade_info
 
diff --git a/mysql-test/suite/rpl/t/rpl_mysql_upgrade.test b/mysql-test/suite/rpl/t/rpl_mysql_upgrade.test
index e99a233ac34..1931e2eab2a 100644
--- a/mysql-test/suite/rpl/t/rpl_mysql_upgrade.test
+++ b/mysql-test/suite/rpl/t/rpl_mysql_upgrade.test
@@ -43,6 +43,9 @@ connection master;
 #With '--force' option, mysql_upgrade always executes all sql statements for upgrading.
 --exec $MYSQL_UPGRADE --skip-verbose --write-binlog --force --user=root > $MYSQLTEST_VARDIR/log/mysql_upgrade.log 2>&1
 
+let $datadir= `select @@datadir`;
+remove_file $datadir/mysql_upgrade_info;
+
 connection master;
 let $after_file= query_get_value(SHOW MASTER STATUS, File, 1);
 let $after_position= query_get_value(SHOW MASTER STATUS, Position, 1);
diff --git a/mysql-test/t/ctype_upgrade.test b/mysql-test/t/ctype_upgrade.test
index cc59d1e4401..62567c5afe4 100644
--- a/mysql-test/t/ctype_upgrade.test
+++ b/mysql-test/t/ctype_upgrade.test
@@ -191,6 +191,7 @@ SELECT GROUP_CONCAT(a ORDER BY BINARY a) FROM maria100004_xxx_croatian_ci GROUP
 SHOW CREATE TABLE mysql050614_xxx_croatian_ci;
 SELECT GROUP_CONCAT(a ORDER BY BINARY a) FROM mysql050614_xxx_croatian_ci GROUP BY a;
 
+remove_file $MYSQLD_DATADIR/mysql_upgrade_info;
 DROP TABLE maria050313_ucs2_croatian_ci_def;
 DROP TABLE maria050313_utf8_croatian_ci;
 DROP TABLE maria050533_xxx_croatian_ci;
diff --git a/mysql-test/t/log_tables_upgrade.test b/mysql-test/t/log_tables_upgrade.test
index d08d74174db..36802fb38ad 100644
--- a/mysql-test/t/log_tables_upgrade.test
+++ b/mysql-test/t/log_tables_upgrade.test
@@ -24,4 +24,5 @@ RENAME TABLE test.bug49823 TO general_log;
 DROP TABLE general_log;
 RENAME TABLE renamed_general_log TO general_log;
 SET GLOBAL general_log = @saved_general_log;
+remove_file $MYSQLD_DATADIR/mysql_upgrade_info;
 USE test;
diff --git a/mysql-test/t/mysql_upgrade_noengine.test b/mysql-test/t/mysql_upgrade_noengine.test
index bbc024788b0..cfc3a1dc406 100644
--- a/mysql-test/t/mysql_upgrade_noengine.test
+++ b/mysql-test/t/mysql_upgrade_noengine.test
@@ -52,5 +52,6 @@ select table_catalog, table_schema, table_name, table_type, engine, row_format,
 
 drop table t1, t2;
 
+remove_file $datadir/mysql_upgrade_info;
 uninstall plugin blackhole;
 uninstall plugin archive;
diff --git a/mysql-test/t/mysql_upgrade_ssl.test b/mysql-test/t/mysql_upgrade_ssl.test
index 9049bf73821..daf5fad3df7 100644
--- a/mysql-test/t/mysql_upgrade_ssl.test
+++ b/mysql-test/t/mysql_upgrade_ssl.test
@@ -8,4 +8,5 @@
 --echo # Bug#55672 mysql_upgrade dies with internal error 
 --echo #
 --exec $MYSQL_UPGRADE --skip-verbose --skip-silent --ssl --force 2>&1
---exit
+--let $datadir= `select @@datadir`
+--remove_file $datadir/mysql_upgrade_info
diff --git a/mysql-test/t/mysql_upgrade_view.test b/mysql-test/t/mysql_upgrade_view.test
index 7afe1ad250d..6a496858d22 100644
--- a/mysql-test/t/mysql_upgrade_view.test
+++ b/mysql-test/t/mysql_upgrade_view.test
@@ -183,5 +183,6 @@ flush tables;
 # back to mariadb default
 drop table mysql.event;
 rename table mysql.ev_bk to mysql.event;
+remove_file $MYSQLD_DATADIR/mysql_upgrade_info;
 drop view v1,v2,v3;
 drop table t1;
diff --git a/mysql-test/t/plugin_auth.test b/mysql-test/t/plugin_auth.test
index c5d96e0d612..d7e838dbf94 100644
--- a/mysql-test/t/plugin_auth.test
+++ b/mysql-test/t/plugin_auth.test
@@ -522,6 +522,8 @@ SELECT IS_NULLABLE, COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS
   WHERE TABLE_SCHEMA= 'mysql' AND TABLE_NAME= 'user' AND
     COLUMN_NAME IN ('plugin', 'authentication_string')
   ORDER BY COLUMN_NAME;
+let $datadir= `select @@datadir`;
+remove_file $datadir/mysql_upgrade_info;
 
 
 --echo #