mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
MDEV-12233 main.mysql_upgrade_noengine fails in buildbot on ppc64le
verify that tests don't leave mysql_upgrade_info in datadir
This commit is contained in:
@ -76,5 +76,9 @@ if (!$tmp) {
|
||||
}
|
||||
|
||||
call mtr.check_testcase();
|
||||
|
||||
let $datadir=`select @@datadir`;
|
||||
list_files $datadir mysql_upgrade_info;
|
||||
|
||||
--enable_query_log
|
||||
|
||||
|
@ -14,4 +14,5 @@
|
||||
--remove_file $out_file
|
||||
--error 0,1
|
||||
--remove_file $err_file
|
||||
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info
|
||||
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
|
@ -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 #
|
||||
|
Reference in New Issue
Block a user