diff options
author | msvensson@pilot.blaudden <> | 2007-03-01 18:12:56 +0100 |
---|---|---|
committer | msvensson@pilot.blaudden <> | 2007-03-01 18:12:56 +0100 |
commit | f5778fc73e4e676f38c4734bca3a96f4d08dc2d7 (patch) | |
tree | dd839a6db9e2985054d2bc99faaafdc4440866fc /mysql-test/t/mysqltest.test | |
parent | ab61d07a30b73e3446b6eab9536ba464a0d55f74 (diff) | |
parent | 2f5a2b2476a0ca43d0a5bdfb979b427ff806839f (diff) | |
download | mariadb-git-f5778fc73e4e676f38c4734bca3a96f4d08dc2d7.tar.gz |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
Diffstat (limited to 'mysql-test/t/mysqltest.test')
-rw-r--r-- | mysql-test/t/mysqltest.test | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test index 0f4a498e702..1914f2794e2 100644 --- a/mysql-test/t/mysqltest.test +++ b/mysql-test/t/mysqltest.test @@ -1288,8 +1288,16 @@ EOF connect (con1,localhost,root,,); connection default; connection con1; +disconnect con1; --enable_abort_on_error +# Test connect without a database +connect (con2,localhost,root,,*NO-ONE*); +--error ER_NO_DB_ERROR +show tables; +disconnect con2; +connection default; + # ---------------------------------------------------------------------------- # Test mysqltest arguments # ---------------------------------------------------------------------------- @@ -1716,5 +1724,17 @@ EOF --exec echo "echo Some output; exit; echo Not this;" | $MYSQL_TEST 2>&1 +# ---------------------------------------------------------------------------- +# Some coverage tests +# ---------------------------------------------------------------------------- + +--disable_query_log +--exec $MYSQL_TEST --help 2>&1 > /dev/null +--exec $MYSQL_TEST --version 2>&1 > /dev/null +--enable_quary_log +--disable_abort_on_error +--error 1 +--exec $MYSQL_TEST a b c 2>&1 > /dev/null +--enable_abort_on_error --echo End of tests |