summaryrefslogtreecommitdiff
path: root/mysql-test/t/mysql.test
diff options
context:
space:
mode:
authorDmitry Shulga <Dmitry.Shulga@oracle.com>2011-02-05 11:04:15 +0600
committerDmitry Shulga <Dmitry.Shulga@oracle.com>2011-02-05 11:04:15 +0600
commitd197051eacb98391b6dfa8ef5ce4bbedbebcbee4 (patch)
tree8a9941779c7f7b3f3998bc65c41aeaf2f35014f0 /mysql-test/t/mysql.test
parent4c9cb95c2e3657b826b856c9dbb0f15a886b422b (diff)
parent980868eb4e4db550497ba40674b5b64f2e062cd9 (diff)
downloadmariadb-git-d197051eacb98391b6dfa8ef5ce4bbedbebcbee4.tar.gz
Auto-merge from mysql-5.1 for bug#57450.
Diffstat (limited to 'mysql-test/t/mysql.test')
-rw-r--r--mysql-test/t/mysql.test6
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test
index 7b5b2a0ded0..a7c9dc54042 100644
--- a/mysql-test/t/mysql.test
+++ b/mysql-test/t/mysql.test
@@ -425,6 +425,12 @@ drop table t1;
--echo
--exec $MYSQL --skip-column-names --vertical test -e "select 1 as a"
+#
+# Bug#57450: mysql client enter in an infinite loop if the standard input is a directory
+#
+--error 1
+--exec $MYSQL < .
+
--echo
--echo #