summaryrefslogtreecommitdiff
path: root/mysql-test/t/mysql_upgrade_ssl.test
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-04-25 17:22:25 +0200
committerSergei Golubchik <sergii@pisem.net>2011-04-25 17:22:25 +0200
commit0accbd0364e0333e0b119aa9ce93e34ded9df6cb (patch)
treebdf0738c29dc1f57fbfba3a1754524e238f15b52 /mysql-test/t/mysql_upgrade_ssl.test
parent37f87d73ae8dc6c30594867b40a5d70159acf63c (diff)
downloadmariadb-git-0accbd0364e0333e0b119aa9ce93e34ded9df6cb.tar.gz
lots of post-merge changes
Diffstat (limited to 'mysql-test/t/mysql_upgrade_ssl.test')
-rw-r--r--mysql-test/t/mysql_upgrade_ssl.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/mysql_upgrade_ssl.test b/mysql-test/t/mysql_upgrade_ssl.test
index d1c029bf33a..8ed818186b2 100644
--- a/mysql-test/t/mysql_upgrade_ssl.test
+++ b/mysql-test/t/mysql_upgrade_ssl.test
@@ -6,5 +6,5 @@
--echo #
--echo # Bug#55672 mysql_upgrade dies with internal error
--echo #
---exec $MYSQL_UPGRADE --skip-verbose --ssl --force 2>&1
+--exec $MYSQL_UPGRADE --skip-verbose --skip-silent --ssl --force 2>&1
--exit