4 files changed, 46 insertions, 1 deletions
diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test
index 829be665e09..5bcce14969a 100644
--- a/mysql-test/t/mysql.test
+++ b/mysql-test/t/mysql.test
@@ -44,7 +44,7 @@ unlock tables;
 drop table t1;
 
 #
-# BUG#16217 - MySQL client misinterpretes multi-byte char as escape `\' 
+# BUG#16217 - MySQL client misinterprets multi-byte char as escape `\' 
 #
 
 # new command \C or charset
@@ -262,4 +262,14 @@ drop table t17583;
 --exec echo "DELIMITER \\\\" > $MYSQLTEST_VARDIR/tmp/bug21412.sql
 --exec $MYSQL             < $MYSQLTEST_VARDIR/tmp/bug21412.sql 2>&1
 
+#
+# Some coverage of not normally used parts
+#
+
+--disable_query_log
+--exec $MYSQL test -e "show status" 2>&1 > /dev/null
+--exec $MYSQL --help 2>&1 > /dev/null
+--exec $MYSQL --version 2>&1 > /dev/null
+--enable_quary_log
+
 --echo End of 5.0 tests
diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test
index b2bda247cd7..f03ccffb7af 100644
--- a/mysql-test/t/mysqlbinlog.test
+++ b/mysql-test/t/mysqlbinlog.test
@@ -175,6 +175,12 @@ call p1();
 --exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000009 | $MYSQL
 call p1();
 drop procedure p1;
+# Some coverage of not normally used parts
+#
+--disable_query_log
+--exec $MYSQL_BINLOG --version 2>&1 > /dev/null
+--exec $MYSQL_BINLOG --help 2>&1 > /dev/null
+--enable_query_log
 
 # clean up
 drop table t1, t2, t03, t04, t3, t4, t5; 
diff --git a/mysql-test/t/mysqlcheck.test b/mysql-test/t/mysqlcheck.test
index 338e16363ea..f4e18d4004f 100644
--- a/mysql-test/t/mysqlcheck.test
+++ b/mysql-test/t/mysqlcheck.test
@@ -1,3 +1,12 @@
+# Clean up after previous tests
+#
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+drop view if exists v1;
+drop database if exists client_test_db;
+--enable_warnings
+
 # Embedded server doesn't support external clients
 --source include/not_embedded.inc
 
diff --git a/mysql-test/t/mysqltest.test b/mysql-test/t/mysqltest.test
index 7da84543e6d..601bf7af7d5 100644
--- a/mysql-test/t/mysqltest.test
+++ b/mysql-test/t/mysqltest.test
@@ -1246,8 +1246,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
 # ----------------------------------------------------------------------------
@@ -1605,5 +1613,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