diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-03-30 12:48:42 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-03-30 12:48:42 +0200 |
| commit | da4d71d10d23c1ac2d10b72baee14991ccb7a146 (patch) | |
| tree | 7cdf3a8c8e72ca7c1c8105427c04123f025bd870 /mysql-test/t/mysql_upgrade_ssl.test | |
| parent | 9ec85009985d644ce7ae797bc3572d0ad0f69bb0 (diff) | |
| parent | a00517ac9707ffd51c092f5af5d198c5ee789bb4 (diff) | |
| download | mariadb-git-da4d71d10d23c1ac2d10b72baee14991ccb7a146.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'mysql-test/t/mysql_upgrade_ssl.test')
| -rw-r--r-- | mysql-test/t/mysql_upgrade_ssl.test | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/t/mysql_upgrade_ssl.test b/mysql-test/t/mysql_upgrade_ssl.test index 9049bf73821..daf5fad3df7 100644 --- a/mysql-test/t/mysql_upgrade_ssl.test +++ b/mysql-test/t/mysql_upgrade_ssl.test @@ -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 |