diff options
author | Marc Alff <marc.alff@oracle.com> | 2010-09-13 17:19:39 -0600 |
---|---|---|
committer | Marc Alff <marc.alff@oracle.com> | 2010-09-13 17:19:39 -0600 |
commit | dbe1c80f3a695d08c8a9b01ae4394d2ab57c1b9a (patch) | |
tree | 77b4ececfaaed8921c4b69a51b3b60131fa80a5e /mysql-test | |
parent | 73384c99c0fc5c0a90e34647d6e1eebf2ddc14d4 (diff) | |
download | mariadb-git-dbe1c80f3a695d08c8a9b01ae4394d2ab57c1b9a.tar.gz |
Bug#53102 perfschema.pfs_upgrade fails when executed direct after mysql_upgrade
Implemented post review comments.
Added --force to the mysql_upgrade command in the test scripts,
so that the test output does not depends on whether other tests involving an
upgrade have been executed or not in the same test suite execution.
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/suite/perfschema/include/upgrade_check.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/perfschema/include/upgrade_check.inc b/mysql-test/suite/perfschema/include/upgrade_check.inc index 935a71ab065..3620e80002f 100644 --- a/mysql-test/suite/perfschema/include/upgrade_check.inc +++ b/mysql-test/suite/perfschema/include/upgrade_check.inc @@ -18,7 +18,7 @@ # --error 1 ---exec $MYSQL_UPGRADE --skip-verbose > $out_file 2> $err_file +--exec $MYSQL_UPGRADE --skip-verbose --force > $out_file 2> $err_file # Verify that mysql_upgrade complained about the performance_schema --cat_file $err_file |