Merge bk-internal.mysql.com:/data0/bk/mysql-5.0

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-marvel


libmysqld/lib_sql.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged

mysql-test/r/mysqlcheck.result

@@ -1,3 +1,6 @@
+DROP TABLE IF EXISTS t1;
+drop view if exists v1;
+drop database if exists client_test_db;
 mysql.columns_priv                                 OK
 mysql.db                                           OK
 mysql.func                                         OK

mysql-test/r/mysqltest.result

@@ -413,6 +413,8 @@ mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 7: Con
 mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 3: connection 'test_con1' not found in connection pool
 mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 2: Connection test_con1 already exists
 connect(localhost,root,,test,MASTER_PORT,MASTER_SOCKET);
+show tables;
+ERROR 3D000: No database selected
 Output from mysqltest-x.inc
 Output from mysqltest-x.inc
 Output from mysqltest-x.inc

mysql-test/r/wait_timeout.result

@@ -6,7 +6,7 @@ select 1;
 1
 1
 select 2;
-ERROR HY000: MySQL server has gone away
+Got one of the listed errors
 select 3;
 3
 3
@@ -14,7 +14,7 @@ select 1;
 1
 1
 select 2;
-ERROR HY000: MySQL server has gone away
+Got one of the listed errors
 select 3;
 3
 3

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
@@ -259,4 +259,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

mysql-test/t/mysqlbinlog.test

@@ -134,6 +134,14 @@ flush logs;
 --exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000006 | $MYSQL
 select * from t5  /* must be (1),(1) */;
 
+#
+# 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; 
 

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
 

mysql-test/t/mysqltest.test

@@ -1243,8 +1243,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
 # ----------------------------------------------------------------------------
@@ -1602,5 +1610,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

mysql-test/t/wait_timeout.test

@@ -46,7 +46,8 @@ while (!`select @aborted_clients`)
 connection default;
 # When the connection is closed in this way, the error code should
 # be consistent see bug#2845 for an explanation
---error 2006
+# depending on platform/client, either errno 2006 or 2013 can occur below
+--error 2006,2013
 select 2;
 --enable_reconnect
 select 3;
@@ -90,7 +91,8 @@ while (!`select @aborted_clients`)
 connection con1;
 # When the connection is closed in this way, the error code should
 # be consistent see bug#2845 for an explanation
---error 2006
+# depending on platform/client, either errno 2006 or 2013 can occur below
+--error 2006,2013
 select 2;
 --enable_reconnect
 select 3;