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

cleanup: pfs_upgrade* tests

Browse Source
This commit is contained in:
Sergei Golubchik
2017-03-16 09:07:20 +01:00
parent 386ef08704
commit bbf0c9d4c3
11 changed files with 4 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,16 +3,14 @@
#
--source include/count_sessions.inc
--exec $MYSQL_UPGRADE --skip-verbose --force > $out_file 2> $err_file
--exec $MYSQL_UPGRADE --skip-verbose --force > $MYSQLTEST_VARDIR/tmp/out_file 2> $MYSQLTEST_VARDIR/tmp/err_file
--source include/wait_until_count_sessions.inc
# Verify that mysql_upgrade does not complain about the performance_schema
--replace_regex /at line [0-9]+/at line ###/
--cat_file $err_file
--error 0,1
--remove_file $out_file
--error 0,1
--remove_file $err_file
--cat_file $MYSQLTEST_VARDIR/tmp/err_file
--remove_file $MYSQLTEST_VARDIR/tmp/out_file
--remove_file $MYSQLTEST_VARDIR/tmp/err_file
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info