Commit 68fc98bd authored by hezx@mail.hezx.com's avatar hezx@mail.hezx.com
Browse files

post fix after push of BUG#33029

parent d0ebb657

mysql-test/r/binlog_killed_simulate.result

+3 −3
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ create table t2 (a int, b int) ENGINE=MyISAM; 
reset master;

load data infile '../std_data_ln/rpl_loaddata.dat' into table t2 /* will be "killed" in the middle */;

ERROR 70100: Query execution was interrupted

show binlog events from 98;

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	98	Begin_load_query	1	#	;file_id=1;block_len=12

master-bin.000001	133	Execute_load_query	1	#	use `test`; load data infile '../std_data_ln/rpl_loaddata.dat' into table t2 /* will be "killed" in the middle */ ;file_id=1

master-bin.000001	#	Begin_load_query	#	#	;file_id=#;block_len=12

master-bin.000001	#	Execute_load_query	#	#	use `test`; load data infile '../std_data_ln/rpl_loaddata.dat' into table t2 /* will be "killed" in the middle */ ;file_id=#

select

(@a:=load_file("MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog"))

is not null;

mysql-test/r/mix_innodb_myisam_binlog.result

+93 −93
Original line number Diff line number Diff line
@@ -6,12 +6,12 @@ begin; 
insert into t1 values(1);

insert into t2 select * from t1;

commit;

show binlog events from 98;

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

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

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

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

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

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

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

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

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

delete from t1;

delete from t2;

reset master;
@@ -21,12 +21,12 @@ insert into t2 select * from t1; 
rollback;

Warnings:

Warning	1196	Some non-transactional changed tables couldn't be rolled back

show binlog events from 98;

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

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

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

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

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

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

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

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

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

delete from t1;

delete from t2;

reset master;
@@ -39,15 +39,15 @@ rollback to savepoint my_savepoint; 
Warnings:

Warning	1196	Some non-transactional changed tables couldn't be rolled back

commit;

show binlog events from 98;

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

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

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

master-bin.000001	253	Query	1	#	use `test`; savepoint my_savepoint

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

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

master-bin.000001	519	Query	1	#	use `test`; rollback to savepoint my_savepoint

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

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

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

master-bin.000001	#	Query	#	#	use `test`; savepoint my_savepoint

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

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

master-bin.000001	#	Query	#	#	use `test`; rollback to savepoint my_savepoint

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

delete from t1;

delete from t2;

reset master;
@@ -65,16 +65,16 @@ select a from t1 order by a; 
a

5

7

show binlog events from 98;

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

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

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

master-bin.000001	253	Query	1	#	use `test`; savepoint my_savepoint

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

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

master-bin.000001	519	Query	1	#	use `test`; rollback to savepoint my_savepoint

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

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

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

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

master-bin.000001	#	Query	#	#	use `test`; savepoint my_savepoint

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

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

master-bin.000001	#	Query	#	#	use `test`; rollback to savepoint my_savepoint

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

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

delete from t1;

delete from t2;

reset master;
@@ -87,46 +87,46 @@ insert into t2 select * from t1; 
select get_lock("a",10);

get_lock("a",10)

1

show binlog events from 98;

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

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

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

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

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

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

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

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

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

delete from t1;

delete from t2;

reset master;

insert into t1 values(9);

insert into t2 select * from t1;

show binlog events from 98;

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

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

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

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

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

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

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

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

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

delete from t1;

delete from t2;

reset master;

insert into t1 values(10);

begin;

insert into t2 select * from t1;

show binlog events from 98;

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

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

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

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

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

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

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

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

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

insert into t1 values(11);

commit;

show binlog events from 98;

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

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

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

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

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

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

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

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

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

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

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

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

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

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

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

alter table t2 engine=INNODB;

delete from t1;

delete from t2;
@@ -135,12 +135,12 @@ begin; 
insert into t1 values(12);

insert into t2 select * from t1;

commit;

show binlog events from 98;

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

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

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

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

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

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

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

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

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

delete from t1;

delete from t2;

reset master;
@@ -148,7 +148,7 @@ begin; 
insert into t1 values(13);

insert into t2 select * from t1;

rollback;

show binlog events from 98;

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

delete from t1;

delete from t2;
@@ -160,11 +160,11 @@ insert into t1 values(15); 
insert into t2 select * from t1;

rollback to savepoint my_savepoint;

commit;

show binlog events from 98;

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

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

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

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

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

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

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

delete from t1;

delete from t2;

reset master;
@@ -180,12 +180,12 @@ select a from t1 order by a; 
a

16

18

show binlog events from 98;

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

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

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

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

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

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

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

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

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

delete from t1;

delete from t2;

alter table t2 type=MyISAM;
@@ -232,35 +232,35 @@ insert into t2 values (3); 
select get_lock("lock1",60);

get_lock("lock1",60)

1

show binlog events from 98;

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

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

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

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

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

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

master-bin.000001	437	Query	1	#	use `test`; delete from t1

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

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

master-bin.000001	609	Query	1	#	use `test`; delete from t2

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

master-bin.000001	713	Query	1	#	use `test`; alter table t2 type=MyISAM

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

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

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

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

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

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

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

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

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

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

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

master-bin.000001	1638	Query	1	#	use `test`; create table t0 (n int)

master-bin.000001	1724	Query	1	#	use `test`; insert t0 select * from t1

master-bin.000001	1813	Query	1	#	use `test`; insert into t0 select GET_LOCK("lock1",null)

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

master-bin.000001	2020	Query	1	#	use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `test`.`t1`,`test`.`ti`

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

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

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

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

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

master-bin.000001	#	Query	#	#	use `test`; delete from t1

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

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

master-bin.000001	#	Query	#	#	use `test`; delete from t2

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

master-bin.000001	#	Query	#	#	use `test`; alter table t2 type=MyISAM

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

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

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

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

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

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

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

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

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

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

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

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

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

master-bin.000001	#	Query	#	#	use `test`; insert into t0 select GET_LOCK("lock1",null)

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

master-bin.000001	#	Query	#	#	use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `test`.`t1`,`test`.`ti`

do release_lock("lock1");

drop table t0,t2;

reset master;

mysql-test/r/multi_update.result

+2 −2
Original line number Diff line number Diff line
@@ -573,8 +573,8 @@ count(*) 
select count(*) from t3 /* must be 1 */;

count(*)

1

show binlog events from 98;

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	98	Query	1	#	use `test`; delete t3.* from t2,t3 where t2.a=t3.a

master-bin.000001	#	Query	#	#	use `test`; delete t3.* from t2,t3 where t2.a=t3.a

drop table t1, t2, t3;

end of tests

mysql-test/r/rpl_auto_increment_bug33029.result

+0 −2
Original line number Diff line number Diff line
@@ -163,5 +163,3 @@ DROP PROCEDURE IF EXISTS p1; 
DROP PROCEDURE IF EXISTS p2;

DROP FUNCTION IF EXISTS f1;

DROP TRIGGER IF EXISTS tr1;
 
Warnings:

Note	1360	Trigger does not exist

mysql-test/r/rpl_user.result

+7 −7
Original line number Diff line number Diff line
@@ -35,11 +35,11 @@ drop user 'not_exist_user1'@'fakehost', 'not_exist_user2'@'fakehost'; 
ERROR HY000: Operation DROP USER failed for 'not_exist_user1'@'fakehost','not_exist_user2'@'fakehost'

select Host,User from mysql.user where Host='fakehost';

Host	User

show binlog events from 98;

show binlog events from <binlog_start>;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	98	Query	1	#	use `test`; create user 'foo'@'fakehost'

master-bin.000001	189	Query	1	#	use `test`; create user 'foo'@'fakehost', 'bar'@'fakehost'

master-bin.000001	298	Query	1	#	use `test`; rename user 'foo'@'fakehost' to 'foofoo'@'fakehost'

master-bin.000001	412	Query	1	#	use `test`; rename user 'not_exist_user1'@'fakehost' to 'foobar'@'fakehost', 'bar'@'fakehost' to 'barbar'@'fakehost'

master-bin.000001	579	Query	1	#	use `test`; drop user 'foofoo'@'fakehost'

master-bin.000001	671	Query	1	#	use `test`; drop user 'not_exist_user1'@'fakehost', 'barbar'@'fakehost'
 
master-bin.000001	#	Query	#	#	use `test`; create user 'foo'@'fakehost'

master-bin.000001	#	Query	#	#	use `test`; create user 'foo'@'fakehost', 'bar'@'fakehost'

master-bin.000001	#	Query	#	#	use `test`; rename user 'foo'@'fakehost' to 'foofoo'@'fakehost'

master-bin.000001	#	Query	#	#	use `test`; rename user 'not_exist_user1'@'fakehost' to 'foobar'@'fakehost', 'bar'@'fakehost' to 'barbar'@'fakehost'

master-bin.000001	#	Query	#	#	use `test`; drop user 'foofoo'@'fakehost'

master-bin.000001	#	Query	#	#	use `test`; drop user 'not_exist_user1'@'fakehost', 'barbar'@'fakehost'