Commit a440007c authored Jan 30, 2008 by mkindahl@dl145h.mysql.com

Changes to make tests pass in pushbuild.

parent 716c63eb

mysql-test/r/bdb_notembedded.result

+6 −0

Original line number	Diff line number	Diff line
		@@ -24,12 +24,18 @@ show binlog events;
		Log_name Pos Event_type Server_id End_log_pos Info
		f n Format_desc 1 n Server ver: VERSION, Binlog ver: 4
		f n Query 1 n use `test`; create table bug16206 (a int) engine= bdb
		f n Query 1 n use `test`; BEGIN
		f n Query 1 n use `test`; insert into bug16206 values(0)
		f n Query 1 n use `test`; COMMIT
		f n Query 1 n use `test`; BEGIN
		f n Query 1 n use `test`; insert into bug16206 values(1)
		f n Query 1 n use `test`; COMMIT
		f n Query 1 n use `test`; BEGIN
		f n Query 1 n use `test`; insert into bug16206 values(2)
		f n Query 1 n use `test`; COMMIT
		f n Query 1 n use `test`; BEGIN
		f n Query 1 n use `test`; insert into bug16206 values(3)
		f n Query 1 n use `test`; COMMIT
		drop table bug16206;
		set autocommit=0;
		End of 5.0 tests

mysql-test/r/rpl_loaddata_map.result

+4 −6

Original line number	Diff line number	Diff line
		@@ -15,12 +15,10 @@ count(*)
		show binlog events in 'master-bin.000002' from 98;
		Log_name Pos Event_type Server_id End_log_pos Info
		master-bin.000002 98 Query 1 # use `test`; create table t2 (id int not null primary key auto_increment)
		master-bin.000002 221 Begin_load_query 1 # ;file_id=1;block_len=7168
		master-bin.000002 7412 Append_block 1 # ;file_id=1;block_len=7168
		master-bin.000002 14603 Append_block 1 # ;file_id=1;block_len=2048
		master-bin.000002 16674 Append_block 1 # ;file_id=1;block_len=7168
		master-bin.000002 23865 Append_block 1 # ;file_id=1;block_len=341
		master-bin.000002 24229 Execute_load_query 1 # use `test`; load data infile 'MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' into table t2 ;file_id=1
		master-bin.000002 221 Begin_load_query 1 # ;file_id=#;block_len=8192
		master-bin.000002 8436 Append_block 1 # ;file_id=#;block_len=8192
		master-bin.000002 16651 Append_block 1 # ;file_id=#;block_len=7509
		master-bin.000002 24183 Execute_load_query 1 # use `test`; load data infile 'MYSQLTEST_VARDIR/tmp/bug30435_5k.txt' into table t2 ;file_id=#
		select count() from t2 / 5 000 */;
		count(*)
		5000

mysql-test/t/rpl_loaddata_map.test

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ select count() from t2 / 5 000 */;
		# the binglog will show fragmented Append_block events
		--let $binlog_start=98
		--replace_column 5 #
		--replace_regex /\/\* xid=.* \\//\/ XID *\//
		--replace_regex /\/\* xid=.* \\//\/ XID *\// /file_id=[0-9]+/file_id=#/
		--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
		--eval show binlog events in 'master-bin.000002' from $binlog_start