Merge mysql.com:/home/my/mysql-5.0

into  mysql.com:/home/my/mysql-5.1
Merge of 'remove compiler warnings when using -Wshadow'

10 files changed, 72 insertions, 17 deletions

diff --git a/mysql-test/suppress.purify b/mysql-test/purify.supp
index 58553130c51..58553130c51 100644
--- a/mysql-test/suppress.purify
+++ b/mysql-test/purify.supp
diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result
index 4163ad1b4f7..d671b347786 100644
--- a/mysql-test/r/mysqlbinlog.result
+++ b/mysql-test/r/mysqlbinlog.result
@@ -1,5 +1,5 @@
 set timestamp=1000000000;
-drop table if exists t1,t2;
+drop table if exists t1,t2,t3,t4,t5,t03,t04;
 create table t1 (word varchar(20));
 create table t2 (id int auto_increment not null primary key);
 insert into t1 values ("abirvalg");
@@ -23,7 +23,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq
 SET @@session.sql_mode=0/*!*/;
 /*!\C latin1 *//*!*/;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-drop table if exists t1,t2/*!*/;
+drop table if exists t1,t2,t3,t4,t5,t03,t04/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 create table t1 (word varchar(20))/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
@@ -100,7 +100,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq
 SET @@session.sql_mode=0/*!*/;
 /*!\C latin1 *//*!*/;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;
-drop table if exists t1,t2/*!*/;
+drop table if exists t1,t2,t3,t4,t5,t03,t04/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
 create table t1 (word varchar(20))/*!*/;
 SET TIMESTAMP=1000000000/*!*/;
@@ -192,6 +192,7 @@ DELIMITER ;
 # End of log file
 ROLLBACK /* added by mysqlbinlog */;
 /*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;
+drop table t1,t2;
 flush logs;
 create table t3 (f text character set utf8);
 create table t4 (f text character set cp932);
@@ -209,14 +210,15 @@ HEX(f)
 select HEX(f) from t4;
 HEX(f)
 835C
+drop table t3,t4,t03,t04;
 flush logs;
 flush logs;
 select * from t5  /* must be (1),(1) */;
 a
 1
 1
+drop table t5;
 flush logs;
-drop table if exists t5;
 create table t5 (c1 int, c2 varchar(128) character set latin1 not null);
 insert into t5 values (1, date_format('2001-01-01','%W'));
 set lc_time_names=de_DE;
@@ -235,6 +237,7 @@ c1	c2
 1	Monday
 2	Montag
 3	Monday
+drop table t5;
 drop procedure if exists p1;
 flush logs;
 create procedure p1()
@@ -270,5 +273,4 @@ call p1();
 1
 1
 drop procedure p1;
-drop table t1, t2, t03, t04, t3, t4, t5;
 flush logs;
diff --git a/mysql-test/r/mysqlcheck.result b/mysql-test/r/mysqlcheck.result
index c664932f2bb..b8ada0adff9 100644
--- a/mysql-test/r/mysqlcheck.result
+++ b/mysql-test/r/mysqlcheck.result
@@ -1,7 +1,6 @@
+DROP TABLE IF EXISTS t1;
+drop view if exists v1;
 drop database if exists client_test_db;
-DROP SCHEMA test;
-CREATE SCHEMA test;
-use test;
 mysql.columns_priv                                 OK
 mysql.db                                           OK
 mysql.event                                        OK
diff --git a/mysql-test/r/mysqltest.result b/mysql-test/r/mysqltest.result
index 12a35fcf48b..e8d82ea8515 100644
--- a/mysql-test/r/mysqltest.result
+++ b/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
diff --git a/mysql-test/r/wait_timeout.result b/mysql-test/r/wait_timeout.result
index b865a17454d..6fbff82f908 100644
--- a/mysql-test/r/wait_timeout.result
+++ b/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
diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test
index c0f33ef9204..23cdb094e83 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
@@ -263,4 +263,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 ad6a16810c5..8c5d5f772fc 100644
--- a/mysql-test/t/mysqlbinlog.test
+++ b/mysql-test/t/mysqlbinlog.test
@@ -9,7 +9,7 @@
 set timestamp=1000000000;
 
 --disable_warnings
-drop table if exists t1,t2;
+drop table if exists t1,t2,t3,t4,t5,t03,t04;
 --enable_warnings
 
 create table t1 (word varchar(20));
@@ -108,8 +108,11 @@ select "--- reading stdin --" as "";
 
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
 --exec $MYSQL_BINLOG --short-form --position=79 - < $MYSQL_TEST_DIR/std_data/trunc_binlog.000001
+drop table t1,t2;
 
+#
 # Bug#16217 (mysql client did not know how not switch its internal charset)
+#
 flush logs;
 create table t3 (f text character set utf8);
 create table t4 (f text character set cp932); 
@@ -123,6 +126,7 @@ select HEX(f) from t03;
 select HEX(f) from t3;
 select HEX(f) from t04;
 select HEX(f) from t4;
+drop table t3,t4,t03,t04;
 
 #
 #BUG#14157: utf8 encoding in binlog without set character_set_client
@@ -136,6 +140,7 @@ flush logs;
 flush logs;
 --exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000006 | $MYSQL
 select * from t5  /* must be (1),(1) */;
+drop table t5;
 
 #
 # Bug#22645 LC_TIME_NAMES: Statement not replicated
@@ -143,7 +148,6 @@ select * from t5  /* must be (1),(1) */;
 # lc_time_names dependent values correctly
 #
 flush logs;
-drop table if exists t5;
 create table t5 (c1 int, c2 varchar(128) character set latin1 not null);
 insert into t5 values (1, date_format('2001-01-01','%W'));
 set lc_time_names=de_DE;
@@ -155,6 +159,8 @@ flush logs;
 drop table t5;
 --exec $MYSQL_BINLOG --short-form $MYSQLTEST_VARDIR/log/master-bin.000008 | $MYSQL
 select * from t5 order by c1;
+drop table t5;
+
 #
 # Bug#20396 Bin Log does not get DELIMETER cmd - Recover StoredProc fails 
 #
@@ -179,8 +185,13 @@ call p1();
 call p1();
 drop procedure p1;
 
-# clean up
-drop table t1, t2, t03, t04, t3, t4, t5; 
+#
+# 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
 
 # End of 5.0 tests
 
diff --git a/mysql-test/t/mysqlcheck.test b/mysql-test/t/mysqlcheck.test
index 074faa48021..ed99adf172c 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
diff --git a/mysql-test/t/wait_timeout.test b/mysql-test/t/wait_timeout.test
index bdff72cdc76..826a35cabdf 100644
--- a/mysql-test/t/wait_timeout.test
+++ b/mysql-test/t/wait_timeout.test
@@ -49,7 +49,8 @@ sleep 1;
 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;
@@ -96,7 +97,8 @@ sleep 1;
 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;