Commit 124dea7f authored Jul 04, 2008 by Chad MILLER

Merge from 5.0. Add new 5.1 files. Drop bdb.

parents bc9a4362 8e222b0d

mysql-test/include/have_big5.inc

+1 −1

Original line number	Diff line number	Diff line
		-- require r/have_big5.require
		disable_query_log;
		show collation like "big5_chinese_ci";
		show collation like 'big5_chinese_ci';
		enable_query_log;

mysql-test/include/have_binlog_format_mixed.inc

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,5 +2,5 @@

		-- require r/have_binlog_format_mixed.require
		disable_query_log;
		show variables like "binlog_format";
		show variables like 'binlog_format';
		enable_query_log;

mysql-test/include/have_binlog_format_mixed_or_row.inc

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,5 +3,5 @@
		--require r/have_binlog_format_row.require
		--disable_query_log
		--replace_result MIXED ROW
		show variables like "binlog_format";
		show variables like 'binlog_format';
		--enable_query_log

mysql-test/include/have_binlog_format_mixed_or_statement.inc

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,5 +4,5 @@ source include/have_log_bin.inc;
		--require r/have_binlog_format_statement.require
		--disable_query_log
		--replace_result MIXED STATEMENT
		show variables like "binlog_format";
		show variables like 'binlog_format';
		--enable_query_log

mysql-test/include/have_binlog_format_row.inc

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,5 +2,5 @@

		-- require r/have_binlog_format_row.require
		disable_query_log;
		show variables like "binlog_format";
		show variables like 'binlog_format';
		enable_query_log;