Commit 81a4074b 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-rpl
parents 39176e9f c4bab45b

mysql-test/r/binlog_stm_binlog.result

+46 −45
Original line number Diff line number Diff line
@@ -2,12 +2,13 @@ create table t1 (a int, b int) engine=innodb; 
begin;

insert into t1 values (1,2);

commit;

show binlog events from <binlog_start>;

show binlog events;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int, b int) engine=innodb

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

master-bin.000001	#	Query	#	#	use `test`; insert into t1 values (1,2)

master-bin.000001	#	Xid	#	#	COMMIT /* XID */

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

master-bin.000001	106	Query	1	213	use `test`; create table t1 (a int, b int) engine=innodb

master-bin.000001	213	Query	1	281	use `test`; BEGIN

master-bin.000001	281	Query	1	90	use `test`; insert into t1 values (1,2)

master-bin.000001	371	Xid	1	398	COMMIT /* XID */

drop table t1;

drop table if exists t1, t2;

reset master;
@@ -21,14 +22,14 @@ insert t2 values (5); 
commit;

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

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

master-bin.000001	#	Query	1	#	use `test`; create table t2 (a int) engine=innodb

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

master-bin.000001	#	Query	1	#	use `test`; insert t1 values (5)

master-bin.000001	#	Xid	1	#	COMMIT /* xid= */

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

master-bin.000001	#	Query	1	#	use `test`; insert t2 values (5)

master-bin.000001	#	Xid	1	#	COMMIT /* xid= */

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

master-bin.000001	#	Query	#	#	use `test`; create table t2 (a int) engine=innodb

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

master-bin.000001	#	Query	#	#	use `test`; insert t1 values (5)

master-bin.000001	#	Xid	#	#	COMMIT /* xid=17 */

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

master-bin.000001	#	Query	#	#	use `test`; insert t2 values (5)

master-bin.000001	#	Xid	#	#	COMMIT /* xid=20 */

drop table t1,t2;

reset master;

create table t1 (n int) engine=innodb;
@@ -165,17 +166,17 @@ DELETE FROM user WHERE host='localhost' AND user='@#@'; 
use test;

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

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

master-bin.000001	#	Intvar	1	#	INSERT_ID=127

master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(null)

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

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

master-bin.000001	#	Query	1	#	use `test`; create table if not exists t2 select * from t1

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

master-bin.000001	#	Query	1	#	use `test`; create table if not exists t3 like tt1

master-bin.000001	#	Query	1	#	use `mysql`; INSERT INTO user SET host='localhost', user='@#@', password=password('Just a test')

master-bin.000001	#	Query	1	#	use `mysql`; UPDATE user SET password=password('Another password') WHERE host='localhost' AND user='@#@'

master-bin.000001	#	Query	1	#	use `mysql`; DELETE FROM user WHERE host='localhost' AND user='@#@'

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

master-bin.000001	#	Intvar	#	#	INSERT_ID=127

master-bin.000001	#	Query	#	#	use `test`; insert into t1 values(null)

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`; create table if not exists t2 select * from t1

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

master-bin.000001	#	Query	#	#	use `test`; create table if not exists t3 like tt1

master-bin.000001	#	Query	#	#	use `mysql`; INSERT INTO user SET host='localhost', user='@#@', password=password('Just a test')

master-bin.000001	#	Query	#	#	use `mysql`; UPDATE user SET password=password('Another password') WHERE host='localhost' AND user='@#@'

master-bin.000001	#	Query	#	#	use `mysql`; DELETE FROM user WHERE host='localhost' AND user='@#@'

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;
@@ -184,25 +185,25 @@ insert delayed into t1 values (null); 
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	1	#	use `test`; create table t1 (id tinyint auto_increment primary key)

master-bin.000001	#	Intvar	1	#	INSERT_ID=127

master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(null)

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

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

master-bin.000001	#	Query	1	#	use `test`; create table if not exists t2 select * from t1

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

master-bin.000001	#	Query	1	#	use `test`; create table if not exists t3 like tt1

master-bin.000001	#	Query	1	#	use `mysql`; INSERT INTO user SET host='localhost', user='@#@', password=password('Just a test')

master-bin.000001	#	Query	1	#	use `mysql`; UPDATE user SET password=password('Another password') WHERE host='localhost' AND user='@#@'

master-bin.000001	#	Query	1	#	use `mysql`; DELETE FROM user WHERE host='localhost' AND user='@#@'

master-bin.000001	#	Query	1	#	use `test`; drop table t1,t2,t3,tt1

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

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

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

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

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

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

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

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

master-bin.000001	#	Intvar	#	#	INSERT_ID=127

master-bin.000001	#	Query	#	#	use `test`; insert into t1 values(null)

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`; create table if not exists t2 select * from t1

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

master-bin.000001	#	Query	#	#	use `test`; create table if not exists t3 like tt1

master-bin.000001	#	Query	#	#	use `mysql`; INSERT INTO user SET host='localhost', user='@#@', password=password('Just a test')

master-bin.000001	#	Query	#	#	use `mysql`; UPDATE user SET password=password('Another password') WHERE host='localhost' AND user='@#@'

master-bin.000001	#	Query	#	#	use `mysql`; DELETE FROM user WHERE host='localhost' AND user='@#@'

master-bin.000001	#	Query	#	#	use `test`; drop table t1,t2,t3,tt1

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

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

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

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

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

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

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

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

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

11 == 11
@@ -225,12 +226,12 @@ drop table if exists t3; 
create table t3 (a int(11) NOT NULL AUTO_INCREMENT, b text, PRIMARY KEY (a) ) engine=innodb;

show master status;

File	Position	Binlog_Do_DB	Binlog_Ignore_DB

master-bin.000001	342		

master-bin.000001	346		

insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa');

insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa');

insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa');

insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa');

show master status /* must show new binlog index after rotating */;

File	Position	Binlog_Do_DB	Binlog_Ignore_DB

master-bin.000002	102		

master-bin.000002	106		

drop table t3;

mysql-test/r/binlog_stm_ctype_ucs.result

+3 −3
Original line number Diff line number Diff line
@@ -3,10 +3,10 @@ create table t2 (c char(30)) charset=ucs2; 
set @v=convert('abc' using ucs2);

reset master;

insert into t2 values (@v);

show binlog events from 106;

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	106	User var	1	145	@`v`=_ucs2 0x006100620063 COLLATE ucs2_general_ci

master-bin.000001	145	Query	1	235	use `test`; insert into t2 values (@v)

master-bin.000001	#	User var	#	#	@`v`=_ucs2 0x006100620063 COLLATE ucs2_general_ci

master-bin.000001	#	Query	#	#	use `test`; insert into t2 values (@v)

flush logs;

/*!40019 SET @@session.max_insert_delayed_threads=0*/;

/*!50003 SET @OLD_COMPLETION_TYPE=@@COMPLETION_TYPE,COMPLETION_TYPE=0*/;

mysql-test/r/binlog_stm_insert_select.result

+5 −3
Original line number Diff line number Diff line
@@ -6,9 +6,10 @@ insert into t2 values(1),(2); 
reset master;

insert into t1 select * from t2;

ERROR 23000: Duplicate entry '2' for key 'a'

show binlog events from <binlog_start>;

show binlog events;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	#	#	use `test`; insert into t1 select * from t2

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

master-bin.000001	106	Query	1	200	use `test`; insert into t1 select * from t2

select * from t1;

a

1
@@ -19,6 +20,7 @@ insert into t1 values(1),(1); 
reset master;

create table t2(unique(a)) select a from t1;

ERROR 23000: Duplicate entry '1' for key 'a'

show binlog events from <binlog_start>;

show binlog events;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

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

drop table t1;

mysql-test/r/ctype_cp932_binlog_stm.result

+10 −10
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@ CREATE TABLE t1(f1 blob); 
PREPARE stmt1 FROM 'INSERT INTO t1 VALUES(?)';

SET @var1= x'8300';

EXECUTE stmt1 USING @var1;

SHOW BINLOG EVENTS FROM 105;

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

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

master-bin.000001	#	User var	1	#	@`var1`=_binary 0x8300 COLLATE binary

master-bin.000001	#	Query	1	#	use `test`; INSERT INTO t1 VALUES(@'var1')

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

master-bin.000001	#	User var	#	#	@`var1`=_binary 0x8300 COLLATE binary

master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES(@'var1')

SELECT HEX(f1) FROM t1;

HEX(f1)

8300
@@ -30,17 +30,17 @@ HEX(s1) HEX(s2) d 
466F6F2773206120426172	ED40ED41ED42	47.93

DROP PROCEDURE bug18293|

DROP TABLE t4|

SHOW BINLOG EVENTS FROM 409|

SHOW BINLOG EVENTS FROM 410|

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	409	Query	1	575	use `test`; CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1,

master-bin.000001	410	Query	1	576	use `test`; CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1,

s2 CHAR(50) CHARACTER SET cp932,

d DECIMAL(10,2))

master-bin.000001	575	Query	1	823	use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE bug18293 (IN ins1 CHAR(50),

master-bin.000001	576	Query	1	824	use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE bug18293 (IN ins1 CHAR(50),

IN ins2 CHAR(50) CHARACTER SET cp932,

IN ind DECIMAL(10,2))

BEGIN

INSERT INTO t4 VALUES (ins1, ins2, ind);

END

master-bin.000001	823	Query	1	1042	use `test`; INSERT INTO t4 VALUES ( NAME_CONST('ins1',_latin1 0x466F6F2773206120426172),  NAME_CONST('ins2',_cp932 0xED40ED41ED42),  NAME_CONST('ind',47.93))

master-bin.000001	1042	Query	1	1131	use `test`; DROP PROCEDURE bug18293

master-bin.000001	1131	Query	1	1210	use `test`; DROP TABLE t4
 
master-bin.000001	824	Query	1	1043	use `test`; INSERT INTO t4 VALUES ( NAME_CONST('ins1',_latin1 0x466F6F2773206120426172),  NAME_CONST('ins2',_cp932 0xED40ED41ED42),  NAME_CONST('ind',47.93))

master-bin.000001	1043	Query	1	1132	use `test`; DROP PROCEDURE bug18293

master-bin.000001	1132	Query	1	1211	use `test`; DROP TABLE t4

mysql-test/r/flush_block_commit_notembedded.result

+2 −2
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ insert t1 values (1); 
flush tables with read lock;

show master status;

File	Position	Binlog_Do_DB	Binlog_Ignore_DB

master-bin.000001	105		

master-bin.000001	106		

commit;

show master status;

File	Position	Binlog_Do_DB	Binlog_Ignore_DB

master-bin.000001	105		

master-bin.000001	106		

unlock tables;

drop table t1;

set autocommit=1;