Commit 4e14d3b7 authored Jul 07, 2006 by unknown

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

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

parents 60403d32 998162c0

mysql-test/r/wait_timeout.result

+4 −0

Original line number	Diff line number	Diff line
		select 0;
		0
		0
		flush status;
		select 1;
		1
		1

mysql-test/t/ndb_alter_table3.test

+3 −0

Original line number	Diff line number	Diff line
		@@ -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

+3 −0

Original line number	Diff line number	Diff line
		@@ -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

+3 −0

Original line number	Diff line number	Diff line
		@@ -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 −0

Original line number	Diff line number	Diff line
		@@ -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;