Skip to content

Commit 386ef08

Browse files
committed
MDEV-12233 main.mysql_upgrade_noengine fails in buildbot on ppc64le
verify that tests don't leave mysql_upgrade_info in datadir
1 parent b1ec35b commit 386ef08

File tree

9 files changed

+16
-1
lines changed

9 files changed

+16
-1
lines changed

mysql-test/include/check-testcase.test

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,5 +76,9 @@ if (!$tmp) {
7676
}
7777

7878
call mtr.check_testcase();
79+
80+
let $datadir=`select @@datadir`;
81+
list_files $datadir mysql_upgrade_info;
82+
7983
--enable_query_log
8084

mysql-test/suite/perfschema/include/upgrade_check.inc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@
1414
--remove_file $out_file
1515
--error 0,1
1616
--remove_file $err_file
17+
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info
1718

mysql-test/suite/rpl/t/rpl_mysql_upgrade.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ connection master;
4343
#With '--force' option, mysql_upgrade always executes all sql statements for upgrading.
4444
--exec $MYSQL_UPGRADE --skip-verbose --write-binlog --force --user=root > $MYSQLTEST_VARDIR/log/mysql_upgrade.log 2>&1
4545

46+
let $datadir= `select @@datadir`;
47+
remove_file $datadir/mysql_upgrade_info;
48+
4649
connection master;
4750
let $after_file= query_get_value(SHOW MASTER STATUS, File, 1);
4851
let $after_position= query_get_value(SHOW MASTER STATUS, Position, 1);

mysql-test/t/ctype_upgrade.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ SELECT GROUP_CONCAT(a ORDER BY BINARY a) FROM maria100004_xxx_croatian_ci GROUP
191191
SHOW CREATE TABLE mysql050614_xxx_croatian_ci;
192192
SELECT GROUP_CONCAT(a ORDER BY BINARY a) FROM mysql050614_xxx_croatian_ci GROUP BY a;
193193

194+
remove_file $MYSQLD_DATADIR/mysql_upgrade_info;
194195
DROP TABLE maria050313_ucs2_croatian_ci_def;
195196
DROP TABLE maria050313_utf8_croatian_ci;
196197
DROP TABLE maria050533_xxx_croatian_ci;

mysql-test/t/log_tables_upgrade.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,5 @@ RENAME TABLE test.bug49823 TO general_log;
2424
DROP TABLE general_log;
2525
RENAME TABLE renamed_general_log TO general_log;
2626
SET GLOBAL general_log = @saved_general_log;
27+
remove_file $MYSQLD_DATADIR/mysql_upgrade_info;
2728
USE test;

mysql-test/t/mysql_upgrade_noengine.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,6 @@ select table_catalog, table_schema, table_name, table_type, engine, row_format,
5252

5353
drop table t1, t2;
5454

55+
remove_file $datadir/mysql_upgrade_info;
5556
uninstall plugin blackhole;
5657
uninstall plugin archive;

mysql-test/t/mysql_upgrade_ssl.test

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@
88
--echo # Bug#55672 mysql_upgrade dies with internal error
99
--echo #
1010
--exec $MYSQL_UPGRADE --skip-verbose --skip-silent --ssl --force 2>&1
11-
--exit
11+
--let $datadir= `select @@datadir`
12+
--remove_file $datadir/mysql_upgrade_info

mysql-test/t/mysql_upgrade_view.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,5 +183,6 @@ flush tables;
183183
# back to mariadb default
184184
drop table mysql.event;
185185
rename table mysql.ev_bk to mysql.event;
186+
remove_file $MYSQLD_DATADIR/mysql_upgrade_info;
186187
drop view v1,v2,v3;
187188
drop table t1;

mysql-test/t/plugin_auth.test

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -522,6 +522,8 @@ SELECT IS_NULLABLE, COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS
522522
WHERE TABLE_SCHEMA= 'mysql' AND TABLE_NAME= 'user' AND
523523
COLUMN_NAME IN ('plugin', 'authentication_string')
524524
ORDER BY COLUMN_NAME;
525+
let $datadir= `select @@datadir`;
526+
remove_file $datadir/mysql_upgrade_info;
525527

526528

527529
--echo #

0 commit comments

Comments
 (0)