Commit c14426ae authored by mats@mats-laptop.(none)'s avatar mats@mats-laptop.(none)
Browse files

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

into  mats-laptop.(none):/home/bk/b29020-mysql-5.1-rpl
parents ab82eca6 c8c4500a

mysql-test/extra/rpl_tests/rpl_row_delayed_ins.test

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ SELECT * FROM t1 ORDER BY a; 
sync_slave_with_master;



connection master;

source include/show_binlog_events.inc;

sync_slave_with_master;

SELECT * FROM t1 ORDER BY a;

connection master;

mysql-test/r/ctype_cp932_binlog_row.result

+2 −0
Original line number Diff line number Diff line
@@ -9,8 +9,10 @@ EXECUTE stmt1 USING @var1; 
show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1(f1 blob)

master-bin.000001	#	Query	#	#	use `test`; BEGIN

master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)

master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	#	#	use `test`; COMMIT

SELECT HEX(f1) FROM t1;

HEX(f1)

8300

mysql-test/suite/binlog/r/binlog_base64_flag.result

+1 −0
Original line number Diff line number Diff line 
DROP TABLE IF EXISTS t1;

==== Test BUG#32407 ====

select * from t1;

a

mysql-test/suite/binlog/r/binlog_multi_engine.result

+2 −0
Original line number Diff line number Diff line
@@ -78,8 +78,10 @@ UPDATE t1n, t1b SET e = 2, b = 3 WHERE f = c; 
ERROR HY000: Binary logging not possible. Message: Row-based format required for this statement, but not allowed by this combination of engines

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	#	#	use `test`; BEGIN

master-bin.000001	#	Table_map	#	#	table_id: # (test.t1m)

master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	#	#	use `test`; COMMIT

master-bin.000001	#	Query	#	#	BEGIN

master-bin.000001	#	Table_map	#	#	table_id: # (test.t1n)

master-bin.000001	#	Table_map	#	#	table_id: # (mysql.ndb_apply_status)

mysql-test/suite/binlog/r/binlog_row_binlog.result

+27 −3
Original line number Diff line number Diff line
@@ -1085,9 +1085,11 @@ show binlog events from 0; 
Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	4	Format_desc	1	106	Server version, Binlog ver: 4

master-bin.000001	106	Query	1	227	use `test`; create table t1 (a bigint unsigned, b bigint(20) unsigned)

master-bin.000001	227	Table_map	1	269	table_id: # (test.t1)

master-bin.000001	269	Write_rows	1	315	table_id: # flags: STMT_END_F

master-bin.000001	315	Query	1	391	use `test`; drop table t1

master-bin.000001	227	Query	1	295	use `test`; BEGIN

master-bin.000001	295	Table_map	1	337	table_id: # (test.t1)

master-bin.000001	337	Write_rows	1	383	table_id: # flags: STMT_END_F

master-bin.000001	383	Query	1	452	use `test`; COMMIT

master-bin.000001	452	Query	1	528	use `test`; drop table t1

End of 5.0 tests

reset master;

create table t1 (id tinyint auto_increment primary key);
@@ -1111,8 +1113,10 @@ use test; 
show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	#	#	use `test`; create table t1 (id tinyint auto_increment primary key)

master-bin.000001	#	Query	#	#	use `test`; BEGIN

master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)

master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	#	#	use `test`; COMMIT

master-bin.000001	#	Query	#	#	use `test`; drop table t1

master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int)

master-bin.000001	#	Query	#	#	use `test`; BEGIN
@@ -1123,12 +1127,18 @@ master-bin.000001 # Query # # use `test`; COMMIT 
master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE IF NOT EXISTS `t3` (

  `a` int(11) DEFAULT NULL

)

master-bin.000001	#	Query	#	#	use `mysql`; BEGIN

master-bin.000001	#	Table_map	#	#	table_id: # (mysql.user)

master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	#	#	use `mysql`; COMMIT

master-bin.000001	#	Query	#	#	use `mysql`; BEGIN

master-bin.000001	#	Table_map	#	#	table_id: # (mysql.user)

master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	#	#	use `mysql`; COMMIT

master-bin.000001	#	Query	#	#	use `mysql`; BEGIN

master-bin.000001	#	Table_map	#	#	table_id: # (mysql.user)

master-bin.000001	#	Delete_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	#	#	use `mysql`; COMMIT

drop table t1,t2,t3,tt1;

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

set @@session.auto_increment_increment=1, @@session.auto_increment_offset=1;
@@ -1138,8 +1148,10 @@ insert delayed into t1 values (300); 
show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	#	#	use `test`; create table t1 (id tinyint auto_increment primary key)

master-bin.000001	#	Query	#	#	use `test`; BEGIN

master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)

master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	#	#	use `test`; COMMIT

master-bin.000001	#	Query	#	#	use `test`; drop table t1

master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int)

master-bin.000001	#	Query	#	#	use `test`; BEGIN
@@ -1150,20 +1162,32 @@ master-bin.000001 # Query # # use `test`; COMMIT 
master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE IF NOT EXISTS `t3` (

  `a` int(11) DEFAULT NULL

)

master-bin.000001	#	Query	#	#	use `mysql`; BEGIN

master-bin.000001	#	Table_map	#	#	table_id: # (mysql.user)

master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	#	#	use `mysql`; COMMIT

master-bin.000001	#	Query	#	#	use `mysql`; BEGIN

master-bin.000001	#	Table_map	#	#	table_id: # (mysql.user)

master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	#	#	use `mysql`; COMMIT

master-bin.000001	#	Query	#	#	use `mysql`; BEGIN

master-bin.000001	#	Table_map	#	#	table_id: # (mysql.user)

master-bin.000001	#	Delete_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	#	#	use `mysql`; COMMIT

master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t1`,`t2`,`t3` /* generated by server */

master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int not null auto_increment, primary key (a)) engine=myisam

master-bin.000001	#	Query	#	#	use `test`; BEGIN

master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)

master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	#	#	use `test`; COMMIT

master-bin.000001	#	Query	#	#	use `test`; BEGIN

master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)

master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	#	#	use `test`; COMMIT

master-bin.000001	#	Query	#	#	use `test`; BEGIN

master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)

master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	#	#	use `test`; COMMIT

insert delayed into t1 values (null),(null),(null),(null);

insert delayed into t1 values (null),(null),(400),(null);

11 == 11