summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-05-05 14:24:25 +0200
committerSergei Golubchik <sergii@pisem.net>2014-05-05 14:24:25 +0200
commita313864814c58e0f35a0baa8c163e40d0d0c3b69 (patch)
tree77d4aa5195224ac00fa5ed31dfbec543527899d7 /mysql-test
parent5401d44708cd9dbf0d60c04505d245e75c261db8 (diff)
downloadmariadb-git-a313864814c58e0f35a0baa8c163e40d0d0c3b69.tar.gz
MDEV-6056 [PATCH] mysqldump writes usage to stdout even when not explicitly requested
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/mysqldump.result4
-rw-r--r--mysql-test/t/mysqldump.test7
2 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
index af1fe4a0d2c..49fd19927fc 100644
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/r/mysqldump.result
@@ -5281,3 +5281,7 @@ drop table t1, t2;
#
# End of 5.1 tests
#
+Usage: mysqldump [OPTIONS] database [tables]
+OR mysqldump [OPTIONS] --databases [OPTIONS] DB1 [DB2 DB3...]
+OR mysqldump [OPTIONS] --all-databases [OPTIONS]
+For more options, use mysqldump --help
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test
index 20afec8b63f..1bf5eb7932f 100644
--- a/mysql-test/t/mysqldump.test
+++ b/mysql-test/t/mysqldump.test
@@ -2462,3 +2462,10 @@ drop table t1, t2;
--error 2
--exec $MYSQL_DUMP -hunknownhost --dump-slave nulldb
+#
+# MDEV-6056 [PATCH] mysqldump writes usage to stdout even when not explicitly requested
+#
+--error 1
+--exec $MYSQL_DUMP --user=foo 2>&1 > $MYSQLTEST_VARDIR/tmp/bug6056.out
+--exec $MYSQL_DUMP --help > $MYSQLTEST_VARDIR/tmp/bug6056.out
+