Commit 80b9a066 authored Mar 08, 2006 by unknown

Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  mysql.com:/users/mkindahl/bk/merge-mysql-5.1-new-wl3023

parents 56df7223 4286a0ad

mysql-test/extra/binlog_tests/binlog.test

+3 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ insert t2 values (5);
		commit;
		# first COMMIT must be Query_log_event, second - Xid_log_event
		--replace_column 2 # 5 #
		--replace_regex /table_id: [0-9]+/table_id: #/
		show binlog events from 102;
		drop table t1,t2;

		@@ -43,6 +44,8 @@ while ($1)
		commit;
		drop table t1;
		--replace_column 2 # 5 #
		--replace_regex /table_id: [0-9]+/table_id: #/
		show binlog events in 'master-bin.000001' from 102;
		--replace_column 2 # 5 #
		--replace_regex /table_id: [0-9]+/table_id: #/
		show binlog events in 'master-bin.000002' from 102;

mysql-test/extra/binlog_tests/blackhole.test

+2 −0

Original line number	Diff line number	Diff line
		@@ -123,6 +123,7 @@ select * from t3;
		let $VERSION=`select version()`;
		--replace_result $VERSION VERSION
		--replace_column 2 # 5 #
		--replace_regex /table_id: [0-9]+/table_id: #/
		show binlog events;

		drop table t1,t2,t3;
		@@ -144,4 +145,5 @@ rollback;
		set autocommit=1;
		--replace_result $VERSION VERSION
		--replace_column 2 # 5 #
		--replace_regex /table_id: [0-9]+/table_id: #/
		show binlog events;

mysql-test/extra/binlog_tests/ctype_cp932_binlog.test

+1 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ SET @var1= x'8300';
		# exercise this code from mysql-test-run.
		EXECUTE stmt1 USING @var1;
		--replace_column 2 # 5 #
		--replace_regex /table_id: [0-9]+/table_id: #/
		SHOW BINLOG EVENTS FROM 102;
		SELECT HEX(f1) FROM t1;
		DROP table t1;

mysql-test/extra/binlog_tests/ctype_ucs_binlog.test

+1 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@ create table t2 (c char(30)) charset=ucs2;
		set @v=convert('abc' using ucs2);
		reset master;
		insert into t2 values (@v);
		--replace_regex /table_id: [0-9]+/table_id: #/
		show binlog events from 102;
		# more important than SHOW BINLOG EVENTS, mysqlbinlog (where we
		# absolutely need variables names to be quoted and strings to be

mysql-test/extra/binlog_tests/drop_temp_table.test

+1 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ select get_lock("a",10);
		let $VERSION=`select version()`;
		--replace_result $VERSION VERSION
		--replace_column 2 # 5 #
		--replace_regex /table_id: [0-9]+/table_id: #/
		show binlog events;
		drop database `drop-temp+table-test`;