database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-12233 main.mysql_upgrade_noengine fails in buildbot on ppc64le

Browse Source 
verify that tests don't leave mysql_upgrade_info in datadir
This commit is contained in:
Sergei Golubchik
2017-03-13 10:54:08 +01:00
parent b1ec35b903
commit 386ef08704
9 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/include/check-testcase.test
View File

@ -76,5 +76,9 @@ if (!$tmp) {
} }
call mtr.check_testcase(); call mtr.check_testcase();
let $datadir=`select @@datadir`;
list_files $datadir mysql_upgrade_info;
--enable_query_log --enable_query_log

1
mysql-test/suite/perfschema/include/upgrade_check.inc
View File

@ -14,4 +14,5 @@
--remove_file $out_file --remove_file $out_file
--error 0,1 --error 0,1
--remove_file $err_file --remove_file $err_file
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info

3
mysql-test/suite/rpl/t/rpl_mysql_upgrade.test
View File

@ -43,6 +43,9 @@ connection master;
#With '--force' option, mysql_upgrade always executes all sql statements for upgrading. #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 --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; connection master;
let $after_file= query_get_value(SHOW MASTER STATUS, File, 1); let $after_file= query_get_value(SHOW MASTER STATUS, File, 1);
let $after_position= query_get_value(SHOW MASTER STATUS, Position, 1); let $after_position= query_get_value(SHOW MASTER STATUS, Position, 1);

1
mysql-test/t/ctype_upgrade.test
View File

@ -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; SHOW CREATE TABLE mysql050614_xxx_croatian_ci;
SELECT GROUP_CONCAT(a ORDER BY BINARY a) FROM mysql050614_xxx_croatian_ci GROUP BY a; 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_ucs2_croatian_ci_def;
DROP TABLE maria050313_utf8_croatian_ci; DROP TABLE maria050313_utf8_croatian_ci;
DROP TABLE maria050533_xxx_croatian_ci; DROP TABLE maria050533_xxx_croatian_ci;

1
mysql-test/t/log_tables_upgrade.test
View File

@ -24,4 +24,5 @@ RENAME TABLE test.bug49823 TO general_log;
DROP TABLE general_log; DROP TABLE general_log;
RENAME TABLE renamed_general_log TO general_log; RENAME TABLE renamed_general_log TO general_log;
SET GLOBAL general_log = @saved_general_log; SET GLOBAL general_log = @saved_general_log;
remove_file $MYSQLD_DATADIR/mysql_upgrade_info;
USE test; USE test;

1
mysql-test/t/mysql_upgrade_noengine.test
View File

@ -52,5 +52,6 @@ select table_catalog, table_schema, table_name, table_type, engine, row_format,
drop table t1, t2; drop table t1, t2;
remove_file $datadir/mysql_upgrade_info;
uninstall plugin blackhole; uninstall plugin blackhole;
uninstall plugin archive; uninstall plugin archive;

3
mysql-test/t/mysql_upgrade_ssl.test
View File

@ -8,4 +8,5 @@
--echo # Bug#55672 mysql_upgrade dies with internal error --echo # Bug#55672 mysql_upgrade dies with internal error
--echo # --echo #
--exec $MYSQL_UPGRADE --skip-verbose --skip-silent --ssl --force 2>&1 --exec $MYSQL_UPGRADE --skip-verbose --skip-silent --ssl --force 2>&1
--exit --let $datadir= `select @@datadir`
--remove_file $datadir/mysql_upgrade_info

1
mysql-test/t/mysql_upgrade_view.test
View File

@ -183,5 +183,6 @@ flush tables;
# back to mariadb default # back to mariadb default
drop table mysql.event; drop table mysql.event;
rename table mysql.ev_bk to mysql.event; rename table mysql.ev_bk to mysql.event;
remove_file $MYSQLD_DATADIR/mysql_upgrade_info;
drop view v1,v2,v3; drop view v1,v2,v3;
drop table t1; drop table t1;

2
mysql-test/t/plugin_auth.test
View File

@ -522,6 +522,8 @@ SELECT IS_NULLABLE, COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS
WHERE TABLE_SCHEMA= 'mysql' AND TABLE_NAME= 'user' AND WHERE TABLE_SCHEMA= 'mysql' AND TABLE_NAME= 'user' AND
COLUMN_NAME IN ('plugin', 'authentication_string') COLUMN_NAME IN ('plugin', 'authentication_string')
ORDER BY COLUMN_NAME; ORDER BY COLUMN_NAME;
let $datadir= `select @@datadir`;
remove_file $datadir/mysql_upgrade_info;
--echo # --echo #