Merge bk-internal:/home/bk/mysql-5.1

into  devsrv-b.mysql.com:/data0/knielsen/tmp-5.1

mysql-test/r/wait_timeout.result

@@ -1,3 +1,7 @@
+select 0;
+0
+0
+flush status;
 select 1;
 1
 1

mysql-test/t/ndb_alter_table3.test

@@ -2,6 +2,9 @@
 -- source include/have_multi_ndb.inc
 -- source include/not_embedded.inc
 
+# BUG#20902: Test fails in statement-based binlogging mode. Remove when fixed.
+-- source include/have_binlog_format_row.inc
+
 --disable_warnings
 DROP TABLE IF EXISTS t1;
 --enable_warnings

mysql-test/t/ndb_autodiscover3.test

@@ -2,6 +2,9 @@
 -- source include/have_multi_ndb.inc
 -- source include/not_embedded.inc
 
+# BUG#20902: Test fails in statement-based binlogging mode. Remove when fixed.
+-- source include/have_binlog_format_row.inc
+
 
 --disable_warnings
 drop table if exists t1, t2;

mysql-test/t/ndb_dd_advance.test

@@ -28,6 +28,9 @@
 -- source include/have_ndb.inc
 -- source include/not_embedded.inc
 
+# BUG#20902: Test fails in statement-based binlogging mode. Remove when fixed.
+-- source include/have_binlog_format_row.inc
+
 --disable_warnings
 DROP TABLE IF EXISTS test.t1;
 DROP TABLE IF EXISTS test.t2;

mysql-test/t/ndb_multi.test

@@ -3,6 +3,9 @@
 -- source include/not_embedded.inc
 -- source include/have_binlog_format_statement.inc
 
+# BUG#20902: Test fails in statement-based binlogging mode. Remove when fixed.
+-- source include/have_binlog_format_row.inc
+
 
 --disable_warnings
 connection server2;

mysql-test/t/wait_timeout.test

@@ -9,16 +9,20 @@
 # Connect with another connection and reset counters
 --disable_query_log
 connect (wait_con,localhost,root,,test,,);
-flush status; # Reset counters
 connection wait_con;
 set session wait_timeout=100;
 let $retries=300;
-let $aborted_clients = `SHOW STATUS LIKE 'aborted_clients'`;
 set @aborted_clients= 0;
 --enable_query_log
 
 # Disable reconnect and do the query
 connection default;
+# If slow host (Valgrind...), we may have already timed out here.
+# So force a reconnect if necessary, using a dummy query. And issue a
+# 'flush status' to reset the 'aborted_clients' counter.
+--enable_reconnect
+select 0;
+flush status;
 --disable_reconnect
 select 1;
 
@@ -46,6 +50,9 @@ connection default;
 select 2;
 --enable_reconnect
 select 3;
+# Disconnect so that we will not be confused by a future abort from this
+# connection.
+disconnect default
 
 #
 # Do the same test as above on a TCP connection
@@ -56,7 +63,6 @@ select 3;
 connection wait_con;
 flush status; # Reset counters
 let $retries=300;
-let $aborted_clients = `SHOW STATUS LIKE 'aborted_clients'`;
 set @aborted_clients= 0;
 --enable_query_log