Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvel

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

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/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;

support-files/disabled_compiler_warnings.txt

+DictTabInfo.cpp : .*invalid access to non-static.*
+DictTabInfo.cpp : .*macro was used incorrectly.*
+EventLogger.cpp : .*defined but not used.* : 916
+NdbSqlUtil.cpp : .*unused variable.* : 684 - 685
+DbdihMain.cpp : .*unused variable.* : 6666
+DbtcMain.cpp : .*unused variable.* : 6947
+DbtcMain.cpp : .*unused variable.* : 11870
+DbtupExecQuery.cpp : .*unused variable.* : 1449
+DbtupSystemRestart.cpp : .*unused variable.* : 95 - 96
+DbtupIndex.cpp : .*unused variable.* : 188 - 242
+ndbd_malloc.cpp : .*defined but not used.* : 25
+main.cpp : .*unused variable.* : 131 - 132