Commit e42acfe9 authored by unknown's avatar unknown
Browse files

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

into  romeo.(none):/home/bkroot/mysql-5.1-new-rpl
parents f17a35a9 6dd107a9

Makefile.am

+5 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ test-unit: 


test-ps:

	cd mysql-test ; \

	./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=statement

	./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=mixed



test-nr:

	cd mysql-test ; \
@@ -129,6 +129,10 @@ test-pr: 
	./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=row



test-ns:

	cd mysql-test ; \

	./mysql-test-run.pl $(force) --mysqld=--binlog-format=mixed



test-binlog-statement:

	cd mysql-test ; \

	./mysql-test-run.pl $(force) --mysqld=--binlog-format=statement

mysql-test/extra/binlog_tests/binlog.test

+1 −21
Original line number Diff line number Diff line
@@ -60,24 +60,4 @@ insert into t1 values(null); 
select * from t1;

drop table t1;



# Test of binlogging of INSERT_ID with INSERT DELAYED

create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;

# First, avoid BUG#20627:

set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1;

# Verify that only one INSERT_ID event is binlogged.

insert delayed into t1 values (207);



# We use sleeps between statements, that's the only way to get a

# repeatable binlog in a normal test run and under Valgrind.

# It may be that the "binlog missing rows" of BUG#20821 shows up

# here.

sleep 2;

insert delayed into t1 values (null);

sleep 2;

insert delayed into t1 values (300);

sleep 2; # time for the delayed queries to reach disk

select * from t1;

--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/

show binlog events from 102;

drop table t1;
 
-- source extra/binlog_tests/binlog_insert_delayed.test

mysql-test/extra/binlog_tests/binlog_insert_delayed.test

0 → 100644
+22 −0
Original line number Diff line number Diff line 
# Test of binlogging of INSERT_ID with INSERT DELAYED

create table t1 (a int not null auto_increment, primary key (a)) engine=myisam;

# First, avoid BUG#20627:

set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1;

# Verify that only one INSERT_ID event is binlogged.

# Note, that because of WL#3368 mixed mode binlog records RBR events for the delayed

insert delayed into t1 values (207);



# We use sleeps between statements, that's the only way to get a

# repeatable binlog in a normal test run and under Valgrind.

# It may be that the "binlog missing rows" of BUG#20821 shows up

# here.

sleep 2;

insert delayed into t1 values (null);

sleep 2;

insert delayed into t1 values (300);

sleep 2; # time for the delayed queries to reach disk

select * from t1;

--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/

show binlog events from 102;

drop table t1;

mysql-test/extra/rpl_tests/rpl_loaddata.test

+1 −1
Original line number Diff line number Diff line 
# Requires statement logging

-- source include/have_binlog_format_statement.inc

-- source include/have_binlog_format_mixed_or_statement.inc



# See if replication of a "LOAD DATA in an autoincrement column"

# Honours autoincrement values

mysql-test/extra/rpl_tests/rpl_stm_000001.test

+1 −1
Original line number Diff line number Diff line 
-- source include/have_binlog_format_statement.inc

-- source include/have_binlog_format_mixed_or_statement.inc

-- source include/master-slave.inc



create table t1 (word char(20) not null);