Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0

into serg.mylan:/usr/home/serg/Abk/mysql-5.0-xa mysql-test/r/ctype_ucs.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/t/strict.test: Auto merged sql/ha_innodb.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_update.cc: Auto merged sql/examples/ha_archive.cc: Auto merged sql/sql_yacc.yy: Auto merged
author: unknown <serg@serg.mylan> 2005-02-17 14:00:44 +0100
committer: unknown <serg@serg.mylan> 2005-02-17 14:00:44 +0100
commit: 7aa1d93fd480dfa0a416a85284a4fd62cc0c9b88 (patch)
tree: 2286825455d6ff56f96a8bcd52bbb6737ebcd354 /mysql-test
parent: d6541adb37068d6545fd6f871e4dd63fa8b1e90a (diff)
parent: c5c497164fbc48bcc50770ced833a07788082aaf (diff)
download: mariadb-git-7aa1d93fd480dfa0a416a85284a4fd62cc0c9b88.tar.gz
43 files changed, 331 insertions, 284 deletions
diff --git a/mysql-test/r/ctype_ucs.result b/mysql-test/r/ctype_ucs.result
index 7a2bdc83584..8cbd4d58192 100644
--- a/mysql-test/r/ctype_ucs.result
+++ b/mysql-test/r/ctype_ucs.result
@@ -523,11 +523,12 @@ 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 95;
+show binlog events from 96;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	95	User var	1	135	@`v`=_ucs2 0x006100620063 COLLATE ucs2_general_ci
-master-bin.000001	135	Query	1	225	use `test`; insert into t2 values (@v)
+master-bin.000001	96	User var	1	136	@`v`=_ucs2 0x006100620063 COLLATE ucs2_general_ci
+master-bin.000001	136	Query	1	226	use `test`; insert into t2 values (@v)
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 SET @`v`:=_ucs2 0x006100620063 COLLATE `ucs2_general_ci`;
 use test;
 SET TIMESTAMP=10000;
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index 5928688ca81..643edb03f4f 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -271,7 +271,7 @@ n
 6
 7
 rollback to savepoint `my_savepoint`;
-ERROR HY000: Got error 153 during ROLLBACK
+ERROR 42000: SAVEPOINT my_savepoint does not exist
 set autocommit=1;
 rollback;
 drop table t1;
@@ -1633,14 +1633,14 @@ t2	CREATE TABLE `t2` (
 drop table t2, t1;
 show status like "binlog_cache_use";
 Variable_name	Value
-Binlog_cache_use	25
+Binlog_cache_use	152
 show status like "binlog_cache_disk_use";
 Variable_name	Value
 Binlog_cache_disk_use	0
 create table t1 (a int) engine=innodb;
 show status like "binlog_cache_use";
 Variable_name	Value
-Binlog_cache_use	26
+Binlog_cache_use	153
 show status like "binlog_cache_disk_use";
 Variable_name	Value
 Binlog_cache_disk_use	1
@@ -1649,7 +1649,7 @@ delete from t1;
 commit;
 show status like "binlog_cache_use";
 Variable_name	Value
-Binlog_cache_use	27
+Binlog_cache_use	154
 show status like "binlog_cache_disk_use";
 Variable_name	Value
 Binlog_cache_disk_use	1
diff --git a/mysql-test/r/insert_select.result b/mysql-test/r/insert_select.result
index 611c6f2712e..47f1b18d8a4 100644
--- a/mysql-test/r/insert_select.result
+++ b/mysql-test/r/insert_select.result
@@ -74,8 +74,8 @@ insert into t1 select * from t2;
 ERROR 23000: Duplicate entry '2' for key 1
 show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	4	Format_desc	1	95	Server ver: VERSION, Binlog ver: 4
-master-bin.000001	95	Query	1	190	use `test`; insert into t1 select * from t2
+master-bin.000001	4	Format_desc	1	96	Server ver: VERSION, Binlog ver: 4
+master-bin.000001	96	Query	1	191	use `test`; insert into t1 select * from t2
 select * from t1;
 a
 1
@@ -88,7 +88,7 @@ create table t2(unique(a)) select a from t1;
 ERROR 23000: Duplicate entry '1' for key 1
 show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	4	Format_desc	1	95	Server ver: VERSION, Binlog ver: 4
+master-bin.000001	4	Format_desc	1	96	Server ver: VERSION, Binlog ver: 4
 drop table t1;
 create table t1 (a int not null);
 create table t2 (a int not null);
diff --git a/mysql-test/r/mix_innodb_myisam_binlog.result b/mysql-test/r/mix_innodb_myisam_binlog.result
index 96a2ac551a9..06ca3245535 100644
--- a/mysql-test/r/mix_innodb_myisam_binlog.result
+++ b/mysql-test/r/mix_innodb_myisam_binlog.result
@@ -6,12 +6,12 @@ begin;
 insert into t1 values(1);
 insert into t2 select * from t1;
 commit;
-show binlog events from 95;
+show binlog events from 96;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	95	Query	1	#	use `test`; BEGIN
-master-bin.000001	164	Query	1	#	use `test`; insert into t1 values(1)
-master-bin.000001	252	Query	1	#	use `test`; insert into t2 select * from t1
-master-bin.000001	347	Query	1	#	use `test`; COMMIT
+master-bin.000001	96	Query	1	#	use `test`; BEGIN
+master-bin.000001	165	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	348	Xid	1	#	COMMIT /* xid=7 */
 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 95;
+show binlog events from 96;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	95	Query	1	#	use `test`; BEGIN
-master-bin.000001	164	Query	1	#	use `test`; insert into t1 values(2)
-master-bin.000001	252	Query	1	#	use `test`; insert into t2 select * from t1
-master-bin.000001	347	Query	1	#	use `test`; ROLLBACK
+master-bin.000001	96	Query	1	#	use `test`; BEGIN
+master-bin.000001	165	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	348	Query	1	#	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 95;
+show binlog events from 96;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	95	Query	1	#	use `test`; BEGIN
-master-bin.000001	164	Query	1	#	use `test`; insert into t1 values(3)
-master-bin.000001	252	Query	1	#	use `test`; savepoint my_savepoint
-master-bin.000001	338	Query	1	#	use `test`; insert into t1 values(4)
-master-bin.000001	426	Query	1	#	use `test`; insert into t2 select * from t1
-master-bin.000001	521	Query	1	#	use `test`; rollback to savepoint my_savepoint
-master-bin.000001	619	Query	1	#	use `test`; COMMIT
+master-bin.000001	96	Query	1	#	use `test`; BEGIN
+master-bin.000001	165	Query	1	#	use `test`; insert into t1 values(3)
+master-bin.000001	253	Query	1	#	use `test`; savepoint my_savepoint
+master-bin.000001	339	Query	1	#	use `test`; insert into t1 values(4)
+master-bin.000001	427	Query	1	#	use `test`; insert into t2 select * from t1
+master-bin.000001	522	Query	1	#	use `test`; rollback to savepoint my_savepoint
+master-bin.000001	620	Xid	1	#	COMMIT /* xid=24 */
 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 95;
+show binlog events from 96;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	95	Query	1	#	use `test`; BEGIN
-master-bin.000001	164	Query	1	#	use `test`; insert into t1 values(5)
-master-bin.000001	252	Query	1	#	use `test`; savepoint my_savepoint
-master-bin.000001	338	Query	1	#	use `test`; insert into t1 values(6)
-master-bin.000001	426	Query	1	#	use `test`; insert into t2 select * from t1
-master-bin.000001	521	Query	1	#	use `test`; rollback to savepoint my_savepoint
-master-bin.000001	619	Query	1	#	use `test`; insert into t1 values(7)
-master-bin.000001	707	Query	1	#	use `test`; COMMIT
+master-bin.000001	96	Query	1	#	use `test`; BEGIN
+master-bin.000001	165	Query	1	#	use `test`; insert into t1 values(5)
+master-bin.000001	253	Query	1	#	use `test`; savepoint my_savepoint
+master-bin.000001	339	Query	1	#	use `test`; insert into t1 values(6)
+master-bin.000001	427	Query	1	#	use `test`; insert into t2 select * from t1
+master-bin.000001	522	Query	1	#	use `test`; rollback to savepoint my_savepoint
+master-bin.000001	620	Query	1	#	use `test`; insert into t1 values(7)
+master-bin.000001	708	Xid	1	#	COMMIT /* xid=36 */
 delete from t1;
 delete from t2;
 reset master;
@@ -87,40 +87,47 @@ insert into t2 select * from t1;
 select get_lock("a",10);
 get_lock("a",10)
 1
-show binlog events from 95;
+show binlog events from 96;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	95	Query	1	#	use `test`; BEGIN
-master-bin.000001	164	Query	1	#	use `test`; insert into t1 values(8)
-master-bin.000001	252	Query	1	#	use `test`; insert into t2 select * from t1
-master-bin.000001	347	Query	1	#	use `test`; ROLLBACK
+master-bin.000001	96	Query	1	#	use `test`; BEGIN
+master-bin.000001	165	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	348	Query	1	#	use `test`; ROLLBACK
+master-bin.000001	420	Query	1	#	use `test`; DO RELEASE_LOCK("a")
 delete from t1;
 delete from t2;
 reset master;
 insert into t1 values(9);
 insert into t2 select * from t1;
-show binlog events from 95;
+show binlog events from 96;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	95	Query	1	#	use `test`; insert into t1 values(9)
-master-bin.000001	183	Query	1	#	use `test`; insert into t2 select * from t1
+master-bin.000001	96	Query	1	#	use `test`; BEGIN
+master-bin.000001	165	Query	1	#	use `test`; insert into t1 values(9)
+master-bin.000001	253	Xid	1	#	COMMIT /* xid=59 */
+master-bin.000001	280	Query	1	#	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 95;
+show binlog events from 96;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	95	Query	1	#	use `test`; insert into t1 values(10)
-master-bin.000001	184	Query	1	#	use `test`; insert into t2 select * from t1
+master-bin.000001	96	Query	1	#	use `test`; BEGIN
+master-bin.000001	165	Query	1	#	use `test`; insert into t1 values(10)
+master-bin.000001	254	Xid	1	#	COMMIT /* xid=65 */
+master-bin.000001	281	Query	1	#	use `test`; insert into t2 select * from t1
 insert into t1 values(11);
 commit;
-show binlog events from 95;
+show binlog events from 96;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	95	Query	1	#	use `test`; insert into t1 values(10)
-master-bin.000001	184	Query	1	#	use `test`; insert into t2 select * from t1
-master-bin.000001	279	Query	1	#	use `test`; BEGIN
-master-bin.000001	348	Query	1	#	use `test`; insert into t1 values(11)
-master-bin.000001	437	Query	1	#	use `test`; COMMIT
+master-bin.000001	96	Query	1	#	use `test`; BEGIN
+master-bin.000001	165	Query	1	#	use `test`; insert into t1 values(10)
+master-bin.000001	254	Xid	1	#	COMMIT /* xid=65 */
+master-bin.000001	281	Query	1	#	use `test`; insert into t2 select * from t1
+master-bin.000001	376	Query	1	#	use `test`; BEGIN
+master-bin.000001	445	Query	1	#	use `test`; insert into t1 values(11)
+master-bin.000001	534	Xid	1	#	COMMIT /* xid=67 */
 alter table t2 engine=INNODB;
 delete from t1;
 delete from t2;
@@ -129,12 +136,12 @@ begin;
 insert into t1 values(12);
 insert into t2 select * from t1;
 commit;
-show binlog events from 95;
+show binlog events from 96;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	95	Query	1	#	use `test`; BEGIN
-master-bin.000001	164	Query	1	#	use `test`; insert into t1 values(12)
-master-bin.000001	253	Query	1	#	use `test`; insert into t2 select * from t1
-master-bin.000001	348	Query	1	#	use `test`; COMMIT
+master-bin.000001	96	Query	1	#	use `test`; BEGIN
+master-bin.000001	165	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	349	Xid	1	#	COMMIT /* xid=77 */
 delete from t1;
 delete from t2;
 reset master;
@@ -142,7 +149,7 @@ begin;
 insert into t1 values(13);
 insert into t2 select * from t1;
 rollback;
-show binlog events from 95;
+show binlog events from 96;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 delete from t1;
 delete from t2;
@@ -154,11 +161,11 @@ insert into t1 values(15);
 insert into t2 select * from t1;
 rollback to savepoint my_savepoint;
 commit;
-show binlog events from 95;
+show binlog events from 96;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	95	Query	1	#	use `test`; BEGIN
-master-bin.000001	164	Query	1	#	use `test`; insert into t1 values(14)
-master-bin.000001	253	Query	1	#	use `test`; COMMIT
+master-bin.000001	96	Query	1	#	use `test`; BEGIN
+master-bin.000001	165	Query	1	#	use `test`; insert into t1 values(14)
+master-bin.000001	254	Xid	1	#	COMMIT /* xid=93 */
 delete from t1;
 delete from t2;
 reset master;
@@ -174,12 +181,12 @@ select a from t1 order by a;
 a
 16
 18
-show binlog events from 95;
+show binlog events from 96;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	95	Query	1	#	use `test`; BEGIN
-master-bin.000001	164	Query	1	#	use `test`; insert into t1 values(16)
-master-bin.000001	253	Query	1	#	use `test`; insert into t1 values(18)
-master-bin.000001	342	Query	1	#	use `test`; COMMIT
+master-bin.000001	96	Query	1	#	use `test`; BEGIN
+master-bin.000001	165	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	343	Xid	1	#	COMMIT /* xid=104 */
 delete from t1;
 delete from t2;
 alter table t2 type=MyISAM;
diff --git a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result
index 7f5adf799e3..ee0047934ab 100644
--- a/mysql-test/r/mysqlbinlog.result
+++ b/mysql-test/r/mysqlbinlog.result
@@ -15,6 +15,7 @@ flush logs;
 
 --- Local --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 use test;
 SET TIMESTAMP=1000000000;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@@ -47,6 +48,7 @@ insert into t1 values ("Alas");
 
 --- --database --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 SET INSERT_ID=1;
 
 --- --position --
@@ -60,6 +62,7 @@ insert into t1 values ("Alas");
 
 --- Remote --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 use test;
 SET TIMESTAMP=1000000000;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@@ -92,6 +95,7 @@ insert into t1 values ("Alas");
 
 --- --database --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 SET INSERT_ID=1;
 
 --- --position --
@@ -105,6 +109,7 @@ insert into t1 values ("Alas");
 
 --- reading stdin --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 use test;
 SET TIMESTAMP=1065204671;
 BEGIN;
diff --git a/mysql-test/r/mysqlbinlog2.result b/mysql-test/r/mysqlbinlog2.result
index 805c25be086..8fdaa5bed4e 100644
--- a/mysql-test/r/mysqlbinlog2.result
+++ b/mysql-test/r/mysqlbinlog2.result
@@ -16,6 +16,7 @@ insert into t1 values(null, "f");
 
 --- Local --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 use test;
 SET TIMESTAMP=1579609942;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@@ -40,6 +41,7 @@ insert into t1 values(null, "e");
 
 --- offset --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 SET INSERT_ID=1;
 use test;
 SET TIMESTAMP=1579609942;
@@ -75,6 +77,7 @@ insert into t1 values(null, "e");
 
 --- stop-position --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 use test;
 SET TIMESTAMP=1579609942;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@@ -93,6 +96,7 @@ insert into t1 values(null, "c");
 
 --- start-datetime --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 SET INSERT_ID=3;
 use test;
 SET TIMESTAMP=1579609944;
@@ -109,6 +113,7 @@ insert into t1 values(null, "e");
 
 --- stop-datetime --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 use test;
 SET TIMESTAMP=1579609942;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@@ -124,6 +129,7 @@ insert into t1 values(null, "b");
 
 --- Local with 2 binlogs on command line --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 use test;
 SET TIMESTAMP=1579609942;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@@ -155,6 +161,7 @@ insert into t1 values(null, "f");
 
 --- offset --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 SET INSERT_ID=1;
 use test;
 SET TIMESTAMP=1579609942;
@@ -204,6 +211,7 @@ insert into t1 values(null, "f");
 
 --- stop-position --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 use test;
 SET TIMESTAMP=1579609942;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@@ -229,6 +237,7 @@ SET INSERT_ID=6;
 
 --- start-datetime --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 SET INSERT_ID=3;
 use test;
 SET TIMESTAMP=1579609944;
@@ -252,6 +261,7 @@ insert into t1 values(null, "f");
 
 --- stop-datetime --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 use test;
 SET TIMESTAMP=1579609942;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@@ -267,6 +277,7 @@ insert into t1 values(null, "b");
 
 --- Remote --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 use test;
 SET TIMESTAMP=1579609942;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@@ -291,6 +302,7 @@ insert into t1 values(null, "e");
 
 --- offset --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 SET INSERT_ID=1;
 use test;
 SET TIMESTAMP=1579609942;
@@ -326,6 +338,7 @@ insert into t1 values(null, "e");
 
 --- stop-position --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 use test;
 SET TIMESTAMP=1579609942;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@@ -344,6 +357,7 @@ insert into t1 values(null, "c");
 
 --- start-datetime --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 SET INSERT_ID=3;
 use test;
 SET TIMESTAMP=1579609944;
@@ -360,6 +374,7 @@ insert into t1 values(null, "e");
 
 --- stop-datetime --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 use test;
 SET TIMESTAMP=1579609942;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@@ -375,6 +390,7 @@ insert into t1 values(null, "b");
 
 --- Remote with 2 binlogs on command line --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 use test;
 SET TIMESTAMP=1579609942;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@@ -406,6 +422,7 @@ insert into t1 values(null, "f");
 
 --- offset --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 SET INSERT_ID=1;
 use test;
 SET TIMESTAMP=1579609942;
@@ -455,6 +472,7 @@ insert into t1 values(null, "f");
 
 --- stop-position --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 use test;
 SET TIMESTAMP=1579609942;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@@ -480,6 +498,7 @@ SET INSERT_ID=6;
 
 --- start-datetime --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 SET INSERT_ID=3;
 use test;
 SET TIMESTAMP=1579609944;
@@ -503,6 +522,7 @@ insert into t1 values(null, "f");
 
 --- stop-datetime --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 use test;
 SET TIMESTAMP=1579609942;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
@@ -518,6 +538,7 @@ insert into t1 values(null, "b");
 
 --- to-last-log --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 use test;
 SET TIMESTAMP=1579609942;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
diff --git a/mysql-test/r/rpl000015.result b/mysql-test/r/rpl000015.result
index 38544c0aed7..44d3a844c74 100644
--- a/mysql-test/r/rpl000015.result
+++ b/mysql-test/r/rpl000015.result
@@ -1,7 +1,7 @@
 reset master;
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	95		
+master-bin.000001	96		
 reset slave;
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
@@ -17,7 +17,7 @@ Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File
 start slave;
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-#	127.0.0.1	root	MASTER_PORT	7	master-bin.000001	95	#	#	master-bin.000001	Yes	Yes							0		0	95	#	None		0	No						#
+#	127.0.0.1	root	MASTER_PORT	7	master-bin.000001	96	#	#	master-bin.000001	Yes	Yes							0		0	96	#	None		0	No						#
 drop table if exists t1;
 create table t1 (n int);
 insert into t1 values (10),(45),(90);
diff --git a/mysql-test/r/rpl_change_master.result b/mysql-test/r/rpl_change_master.result
index 5fbf4cc3318..033d55140e3 100644
--- a/mysql-test/r/rpl_change_master.result
+++ b/mysql-test/r/rpl_change_master.result
@@ -16,11 +16,11 @@ n
 1
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	376	#	#	master-bin.000001	No	No							0		0	288	#	None		0	No						#
+#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	377	#	#	master-bin.000001	No	No							0		0	289	#	None		0	No						#
 change master to master_user='root';
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	288	#	#	master-bin.000001	No	No							0		0	288	#	None		0	No						#
+#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	289	#	#	master-bin.000001	No	No							0		0	289	#	None		0	No						#
 select release_lock("a");
 release_lock("a")
 1
diff --git a/mysql-test/r/rpl_charset.result b/mysql-test/r/rpl_charset.result
index 6b8a2ac70de..d105e208777 100644
--- a/mysql-test/r/rpl_charset.result
+++ b/mysql-test/r/rpl_charset.result
@@ -103,7 +103,7 @@ a	b
 1	cp850_general_ci
 drop database mysqltest2;
 drop database mysqltest3;
-show binlog events from 95;
+show binlog events from 96;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	1	#	drop database if exists mysqltest2
 master-bin.000001	#	Query	1	#	drop database if exists mysqltest3
@@ -175,6 +175,7 @@ select hex(c1), hex(c2) from t1;
 hex(c1)	hex(c2)
 CDF32C20E7E020F0FBE1E0EBEAF3	CDF32C20E7E020F0FBE1E0EBEAF3
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 SET TIMESTAMP=1000000000;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
 SET @@session.sql_mode=0;
diff --git a/mysql-test/r/rpl_error_ignored_table.result b/mysql-test/r/rpl_error_ignored_table.result
index 917fe103b43..cf207270ca8 100644
--- a/mysql-test/r/rpl_error_ignored_table.result
+++ b/mysql-test/r/rpl_error_ignored_table.result
@@ -9,7 +9,7 @@ insert into t1 values (1),(1);
 ERROR 23000: Duplicate entry '1' for key 1
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	287	#	#	master-bin.000001	Yes	Yes				test.t3,test.t1,test.t2			0		0	287	#	None		0	No						#
+#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	288	#	#	master-bin.000001	Yes	Yes				test.t3,test.t1,test.t2			0		0	288	#	None		0	No						#
 show tables like 't1';
 Tables_in_test (t1)
 drop table t1;
@@ -26,14 +26,14 @@ select (@id := id) - id from t3;
 0
 kill @id;
 drop table t2,t3;
-show binlog events from 95;
+show binlog events from 96;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	95	Query	1	194	use `test`; create table t1 (a int primary key)
-master-bin.000001	194	Query	1	287	use `test`; insert into t1 values (1),(1)
-master-bin.000001	287	Query	1	364	use `test`; drop table t1
-master-bin.000001	364	Query	1	463	use `test`; create table t2 (a int primary key)
-master-bin.000001	463	Query	1	551	use `test`; insert into t2 values(1)
-master-bin.000001	551	Query	1	639	use `test`; create table t3 (id int)
-master-bin.000001	639	Query	1	741	use `test`; insert into t3 values(connection_id())
-master-bin.000001	741	Query	1	861	use `test`; update t2 set a = a + 1 + get_lock('crash_lock%20C', 10)
-master-bin.000001	861	Query	1	941	use `test`; drop table t2,t3
+master-bin.000001	96	Query	1	195	use `test`; create table t1 (a int primary key)
+master-bin.000001	195	Query	1	288	use `test`; insert into t1 values (1),(1)
+master-bin.000001	288	Query	1	365	use `test`; drop table t1
+master-bin.000001	365	Query	1	464	use `test`; create table t2 (a int primary key)
+master-bin.000001	464	Query	1	552	use `test`; insert into t2 values(1)
+master-bin.000001	552	Query	1	640	use `test`; create table t3 (id int)
+master-bin.000001	640	Query	1	742	use `test`; insert into t3 values(connection_id())
+master-bin.000001	742	Query	1	862	use `test`; update t2 set a = a + 1 + get_lock('crash_lock%20C', 10)
+master-bin.000001	862	Query	1	942	use `test`; drop table t2,t3
diff --git a/mysql-test/r/rpl_flush_log_loop.result b/mysql-test/r/rpl_flush_log_loop.result
index c57f6877516..d0e1c975312 100644
--- a/mysql-test/r/rpl_flush_log_loop.result
+++ b/mysql-test/r/rpl_flush_log_loop.result
@@ -14,4 +14,4 @@ start slave;
 flush logs;
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-#	127.0.0.1	root	SLAVE_PORT	60	slave-bin.000001	206	#	#	slave-bin.000001	Yes	Yes							0		0	206	#	None		0	No						#
+#	127.0.0.1	root	SLAVE_PORT	60	slave-bin.000001	207	#	#	slave-bin.000001	Yes	Yes							0		0	207	#	None		0	No						#
diff --git a/mysql-test/r/rpl_flush_tables.result b/mysql-test/r/rpl_flush_tables.result
index 241aada0e40..0c52344e8a2 100644
--- a/mysql-test/r/rpl_flush_tables.result
+++ b/mysql-test/r/rpl_flush_tables.result
@@ -14,27 +14,27 @@ rename table t1 to t5, t2 to t1;
 flush no_write_to_binlog tables;
 show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	4	Format_desc	1	95	Server ver: SERVER_VERSION, Binlog ver: 4
-master-bin.000001	95	Query	1	182	use `test`; create table t1 (a int)
-master-bin.000001	182	Query	1	272	use `test`; insert into t1 values (10)
-master-bin.000001	272	Query	1	359	use `test`; create table t2 (a int)
-master-bin.000001	359	Query	1	469	use `test`; create table t3 (a int) engine=merge union(t1)
-master-bin.000001	469	Query	1	556	use `test`; create table t4 (a int)
-master-bin.000001	556	Query	1	651	use `test`; insert into t4 select * from t3
-master-bin.000001	651	Query	1	746	use `test`; rename table t1 to t5, t2 to t1
+master-bin.000001	4	Format_desc	1	96	Server ver: SERVER_VERSION, Binlog ver: 4
+master-bin.000001	96	Query	1	183	use `test`; create table t1 (a int)
+master-bin.000001	183	Query	1	273	use `test`; insert into t1 values (10)
+master-bin.000001	273	Query	1	360	use `test`; create table t2 (a int)
+master-bin.000001	360	Query	1	470	use `test`; create table t3 (a int) engine=merge union(t1)
+master-bin.000001	470	Query	1	557	use `test`; create table t4 (a int)
+master-bin.000001	557	Query	1	652	use `test`; insert into t4 select * from t3
+master-bin.000001	652	Query	1	747	use `test`; rename table t1 to t5, t2 to t1
 select * from t3;
 a
 flush tables;
 show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	4	Format_desc	1	95	Server ver: SERVER_VERSION, Binlog ver: 4
-master-bin.000001	95	Query	1	182	use `test`; create table t1 (a int)
-master-bin.000001	182	Query	1	272	use `test`; insert into t1 values (10)
-master-bin.000001	272	Query	1	359	use `test`; create table t2 (a int)
-master-bin.000001	359	Query	1	469	use `test`; create table t3 (a int) engine=merge union(t1)
-master-bin.000001	469	Query	1	556	use `test`; create table t4 (a int)
-master-bin.000001	556	Query	1	651	use `test`; insert into t4 select * from t3
-master-bin.000001	651	Query	1	746	use `test`; rename table t1 to t5, t2 to t1
-master-bin.000001	746	Query	1	822	use `test`; flush tables
+master-bin.000001	4	Format_desc	1	96	Server ver: SERVER_VERSION, Binlog ver: 4
+master-bin.000001	96	Query	1	183	use `test`; create table t1 (a int)
+master-bin.000001	183	Query	1	273	use `test`; insert into t1 values (10)
+master-bin.000001	273	Query	1	360	use `test`; create table t2 (a int)
+master-bin.000001	360	Query	1	470	use `test`; create table t3 (a int) engine=merge union(t1)
+master-bin.000001	470	Query	1	557	use `test`; create table t4 (a int)
+master-bin.000001	557	Query	1	652	use `test`; insert into t4 select * from t3
+master-bin.000001	652	Query	1	747	use `test`; rename table t1 to t5, t2 to t1
+master-bin.000001	747	Query	1	823	use `test`; flush tables
 select * from t3;
 a
diff --git a/mysql-test/r/rpl_loaddata.result b/mysql-test/r/rpl_loaddata.result
index ccf77083362..32aa02c31e1 100644
--- a/mysql-test/r/rpl_loaddata.result
+++ b/mysql-test/r/rpl_loaddata.result
@@ -22,7 +22,7 @@ day	id	category	name
 2003-03-22	2416	a	bbbbb
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-slave-bin.000001	1096		
+slave-bin.000001	1097		
 drop table t1;
 drop table t2;
 drop table t3;
@@ -33,7 +33,7 @@ set global sql_slave_skip_counter=1;
 start slave;
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	1559	#	#	master-bin.000001	Yes	Yes							0		0	1559	#	None		0	No						#
+#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	1560	#	#	master-bin.000001	Yes	Yes							0		0	1560	#	None		0	No						#
 set sql_log_bin=0;
 delete from t1;
 set sql_log_bin=1;
@@ -43,7 +43,7 @@ change master to master_user='test';
 change master to master_user='root';
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	1667	#	#	master-bin.000001	No	No							0		0	1667	#	None		0	No						#
+#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	1668	#	#	master-bin.000001	No	No							0		0	1668	#	None		0	No						#
 set global sql_slave_skip_counter=1;
 start slave;
 set sql_log_bin=0;
@@ -64,5 +64,5 @@ terminated by ',' optionally enclosed by '%' escaped by '@' lines terminated by
 ERROR 23000: Duplicate entry '2003-03-22' for key 1
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	536		
+master-bin.000001	537		
 drop table t2;
diff --git a/mysql-test/r/rpl_loaddata_rule_m.result b/mysql-test/r/rpl_loaddata_rule_m.result
index 973f7eb6abc..86165d5a2f9 100644
--- a/mysql-test/r/rpl_loaddata_rule_m.result
+++ b/mysql-test/r/rpl_loaddata_rule_m.result
@@ -10,8 +10,8 @@ create database mysqltest;
 create table t1(a int, b int, unique(b));
 use mysqltest;
 load data infile '../../std_data/rpl_loaddata.dat' into table test.t1;
-show binlog events from 95;
+show binlog events from 96;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	95	Query	1	197	drop database if exists mysqltest
-master-bin.000001	197	Query	1	291	create database mysqltest
+master-bin.000001	96	Query	1	198	drop database if exists mysqltest
+master-bin.000001	198	Query	1	292	create database mysqltest
 drop database mysqltest;
diff --git a/mysql-test/r/rpl_loaddata_rule_s.result b/mysql-test/r/rpl_loaddata_rule_s.result
index d7a24410f9c..6cd91ea5bf5 100644
--- a/mysql-test/r/rpl_loaddata_rule_s.result
+++ b/mysql-test/r/rpl_loaddata_rule_s.result
@@ -10,5 +10,5 @@ load data infile '../../std_data/rpl_loaddata.dat' into table test.t1;
 select count(*) from t1;
 count(*)
 2
-show binlog events from 95;
+show binlog events from 96;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result
index f3827ad5c32..383c13a4747 100644
--- a/mysql-test/r/rpl_log.result
+++ b/mysql-test/r/rpl_log.result
@@ -19,25 +19,25 @@ count(*)
 drop table t1;
 show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	4	Format_desc	1	95	Server ver: VERSION, Binlog ver: 4
-master-bin.000001	95	Query	1	217	use `test`; create table t1(n int not null auto_increment primary key)
-master-bin.000001	217	Intvar	1	245	INSERT_ID=1
-master-bin.000001	245	Query	1	337	use `test`; insert into t1 values (NULL)
-master-bin.000001	337	Query	1	414	use `test`; drop table t1
-master-bin.000001	414	Query	1	518	use `test`; create table t1 (word char(20) not null)
-master-bin.000001	518	Create_file	1	1188	db=test;table=t1;file_id=1;block_len=581
-master-bin.000001	1188	Exec_load	1	1211	;file_id=1
-master-bin.000001	1211	Query	1	1288	use `test`; drop table t1
-show binlog events from 95 limit 1;
+master-bin.000001	4	Format_desc	1	96	Server ver: VERSION, Binlog ver: 4
+master-bin.000001	96	Query	1	218	use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001	218	Intvar	1	246	INSERT_ID=1
+master-bin.000001	246	Query	1	338	use `test`; insert into t1 values (NULL)
+master-bin.000001	338	Query	1	415	use `test`; drop table t1
+master-bin.000001	415	Query	1	519	use `test`; create table t1 (word char(20) not null)
+master-bin.000001	519	Create_file	1	1189	db=test;table=t1;file_id=1;block_len=581
+master-bin.000001	1189	Exec_load	1	1212	;file_id=1
+master-bin.000001	1212	Query	1	1289	use `test`; drop table t1
+show binlog events from 96 limit 1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	95	Query	1	217	use `test`; create table t1(n int not null auto_increment primary key)
-show binlog events from 95 limit 2;
+master-bin.000001	96	Query	1	218	use `test`; create table t1(n int not null auto_increment primary key)
+show binlog events from 96 limit 2;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	95	Query	1	217	use `test`; create table t1(n int not null auto_increment primary key)
-master-bin.000001	217	Intvar	1	245	INSERT_ID=1
-show binlog events from 95 limit 2,1;
+master-bin.000001	96	Query	1	218	use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001	218	Intvar	1	246	INSERT_ID=1
+show binlog events from 96 limit 2,1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	245	Query	1	337	use `test`; insert into t1 values (NULL)
+master-bin.000001	246	Query	1	338	use `test`; insert into t1 values (NULL)
 flush logs;
 create table t5 (a int);
 drop table t5;
@@ -49,24 +49,24 @@ insert into t1 values (1);
 drop table t1;
 show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	4	Format_desc	1	95	Server ver: VERSION, Binlog ver: 4
-master-bin.000001	95	Query	1	217	use `test`; create table t1(n int not null auto_increment primary key)
-master-bin.000001	217	Intvar	1	245	INSERT_ID=1
-master-bin.000001	245	Query	1	337	use `test`; insert into t1 values (NULL)
-master-bin.000001	337	Query	1	414	use `test`; drop table t1
-master-bin.000001	414	Query	1	518	use `test`; create table t1 (word char(20) not null)
-master-bin.000001	518	Create_file	1	1188	db=test;table=t1;file_id=1;block_len=581
-master-bin.000001	1188	Exec_load	1	1211	;file_id=1
-master-bin.000001	1211	Query	1	1288	use `test`; drop table t1
-master-bin.000001	1288	Rotate	1	1332	master-bin.000002;pos=4
+master-bin.000001	4	Format_desc	1	96	Server ver: VERSION, Binlog ver: 4
+master-bin.000001	96	Query	1	218	use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001	218	Intvar	1	246	INSERT_ID=1
+master-bin.000001	246	Query	1	338	use `test`; insert into t1 values (NULL)
+master-bin.000001	338	Query	1	415	use `test`; drop table t1
+master-bin.000001	415	Query	1	519	use `test`; create table t1 (word char(20) not null)
+master-bin.000001	519	Create_file	1	1189	db=test;table=t1;file_id=1;block_len=581
+master-bin.000001	1189	Exec_load	1	1212	;file_id=1
+master-bin.000001	1212	Query	1	1289	use `test`; drop table t1
+master-bin.000001	1289	Rotate	1	1333	master-bin.000002;pos=4
 show binlog events in 'master-bin.000002';
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000002	4	Format_desc	1	95	Server ver: VERSION, Binlog ver: 4
-master-bin.000002	95	Query	1	182	use `test`; create table t5 (a int)
-master-bin.000002	182	Query	1	259	use `test`; drop table t5
-master-bin.000002	259	Query	1	346	use `test`; create table t1 (n int)
-master-bin.000002	346	Query	1	435	use `test`; insert into t1 values (1)
-master-bin.000002	435	Query	1	512	use `test`; drop table t1
+master-bin.000002	4	Format_desc	1	96	Server ver: VERSION, Binlog ver: 4
+master-bin.000002	96	Query	1	183	use `test`; create table t5 (a int)
+master-bin.000002	183	Query	1	260	use `test`; drop table t5
+master-bin.000002	260	Query	1	347	use `test`; create table t1 (n int)
+master-bin.000002	347	Query	1	436	use `test`; insert into t1 values (1)
+master-bin.000002	436	Query	1	513	use `test`; drop table t1
 show binary logs;
 Log_name
 master-bin.000001
@@ -78,26 +78,26 @@ slave-bin.000001
 slave-bin.000002
 show binlog events in 'slave-bin.000001' from 4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-bin.000001	4	Format_desc	2	95	Server ver: VERSION, Binlog ver: 4
-slave-bin.000001	95	Query	1	217	use `test`; create table t1(n int not null auto_increment primary key)
-slave-bin.000001	217	Intvar	1	245	INSERT_ID=1
-slave-bin.000001	245	Query	1	337	use `test`; insert into t1 values (NULL)
-slave-bin.000001	337	Query	1	414	use `test`; drop table t1
-slave-bin.000001	414	Query	1	518	use `test`; create table t1 (word char(20) not null)
-slave-bin.000001	518	Create_file	1	1197	db=test;table=t1;file_id=1;block_len=581
-slave-bin.000001	1197	Exec_load	1	1220	;file_id=1
-slave-bin.000001	1220	Query	1	1297	use `test`; drop table t1
-slave-bin.000001	1297	Query	1	1384	use `test`; create table t5 (a int)
-slave-bin.000001	1384	Query	1	1461	use `test`; drop table t5
-slave-bin.000001	1461	Rotate	2	1504	slave-bin.000002;pos=4
+slave-bin.000001	4	Format_desc	2	96	Server ver: VERSION, Binlog ver: 4
+slave-bin.000001	96	Query	1	218	use `test`; create table t1(n int not null auto_increment primary key)
+slave-bin.000001	218	Intvar	1	246	INSERT_ID=1
+slave-bin.000001	246	Query	1	338	use `test`; insert into t1 values (NULL)
+slave-bin.000001	338	Query	1	415	use `test`; drop table t1
+slave-bin.000001	415	Query	1	519	use `test`; create table t1 (word char(20) not null)
+slave-bin.000001	519	Create_file	1	1198	db=test;table=t1;file_id=1;block_len=581
+slave-bin.000001	1198	Exec_load	1	1221	;file_id=1
+slave-bin.000001	1221	Query	1	1298	use `test`; drop table t1
+slave-bin.000001	1298	Query	1	1385	use `test`; create table t5 (a int)
+slave-bin.000001	1385	Query	1	1462	use `test`; drop table t5
+slave-bin.000001	1462	Rotate	2	1505	slave-bin.000002;pos=4
 show binlog events in 'slave-bin.000002' from 4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-bin.000002	4	Format_desc	2	95	Server ver: VERSION, Binlog ver: 4
-slave-bin.000002	95	Query	1	182	use `test`; create table t1 (n int)
-slave-bin.000002	182	Query	1	271	use `test`; insert into t1 values (1)
-slave-bin.000002	271	Query	1	348	use `test`; drop table t1
+slave-bin.000002	4	Format_desc	2	96	Server ver: VERSION, Binlog ver: 4
+slave-bin.000002	96	Query	1	183	use `test`; create table t1 (n int)
+slave-bin.000002	183	Query	1	272	use `test`; insert into t1 values (1)
+slave-bin.000002	272	Query	1	349	use `test`; drop table t1
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-#	127.0.0.1	root	MASTER_PORT	1	master-bin.000002	512	#	#	master-bin.000002	Yes	Yes							0		0	512	#	None		0	No						#
+#	127.0.0.1	root	MASTER_PORT	1	master-bin.000002	513	#	#	master-bin.000002	Yes	Yes							0		0	513	#	None		0	No						#
 show binlog events in 'slave-bin.000005' from 4;
 ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
diff --git a/mysql-test/r/rpl_log_pos.result b/mysql-test/r/rpl_log_pos.result
index 6ea07cf7173..60262c5e227 100644
--- a/mysql-test/r/rpl_log_pos.result
+++ b/mysql-test/r/rpl_log_pos.result
@@ -6,10 +6,10 @@ drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	95		
+master-bin.000001	96		
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	95	#	#	master-bin.000001	Yes	Yes							0		0	95	#	None		0	No						#
+#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	96	#	#	master-bin.000001	Yes	Yes							0		0	96	#	None		0	No						#
 stop slave;
 change master to master_log_pos=73;
 start slave;
@@ -30,13 +30,13 @@ Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File
 #	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	173	#	#	master-bin.000001	No	Yes							0		0	173	#	None		0	No						#
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	95		
+master-bin.000001	96		
 create table if not exists t1 (n int);
 drop table if exists t1;
 create table t1 (n int);
 insert into t1 values (1),(2),(3);
 stop slave;
-change master to master_log_pos=95;
+change master to master_log_pos=96;
 start slave;
 select * from t1;
 n
diff --git a/mysql-test/r/rpl_max_relay_size.result b/mysql-test/r/rpl_max_relay_size.result
index c1f8b0ad889..d56dedbbdca 100644
--- a/mysql-test/r/rpl_max_relay_size.result
+++ b/mysql-test/r/rpl_max_relay_size.result
@@ -16,7 +16,7 @@ select @@global.max_relay_log_size;
 start slave;
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	73751	#	#	master-bin.000001	Yes	Yes							0		0	73751	#	None		0	No						#
+#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	73752	#	#	master-bin.000001	Yes	Yes							0		0	73752	#	None		0	No						#
 stop slave;
 reset slave;
 set global max_relay_log_size=(5*4096);
@@ -26,7 +26,7 @@ select @@global.max_relay_log_size;
 start slave;
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	73751	#	#	master-bin.000001	Yes	Yes							0		0	73751	#	None		0	No						#
+#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	73752	#	#	master-bin.000001	Yes	Yes							0		0	73752	#	None		0	No						#
 stop slave;
 reset slave;
 set global max_relay_log_size=0;
@@ -36,7 +36,7 @@ select @@global.max_relay_log_size;
 start slave;
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	73751	#	#	master-bin.000001	Yes	Yes							0		0	73751	#	None		0	No						#
+#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	73752	#	#	master-bin.000001	Yes	Yes							0		0	73752	#	None		0	No						#
 stop slave;
 reset slave;
 flush logs;
@@ -49,13 +49,13 @@ flush logs;
 create table t1 (a int);
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	73838	#	#	master-bin.000001	Yes	Yes							0		0	73838	#	None		0	No						#
+#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	73839	#	#	master-bin.000001	Yes	Yes							0		0	73839	#	None		0	No						#
 flush logs;
 drop table t1;
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	73915	#	#	master-bin.000001	Yes	Yes							0		0	73915	#	None		0	No						#
+#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	73916	#	#	master-bin.000001	Yes	Yes							0		0	73916	#	None		0	No						#
 flush logs;
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000002	95		
+master-bin.000002	96		
diff --git a/mysql-test/r/rpl_relayrotate.result b/mysql-test/r/rpl_relayrotate.result
index 38a5a634dd6..581efe52d7c 100644
--- a/mysql-test/r/rpl_relayrotate.result
+++ b/mysql-test/r/rpl_relayrotate.result
@@ -18,5 +18,5 @@ max(a)
 8000
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	743228	#	#	master-bin.000001	Yes	Yes							0		0	743228	#	None		0	No						#
+#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	743186	#	#	master-bin.000001	Yes	Yes							0		0	743186	#	None		0	No						#
 drop table t1;
diff --git a/mysql-test/r/rpl_replicate_do.result b/mysql-test/r/rpl_replicate_do.result
index df75433e84e..ec065c10e48 100644
--- a/mysql-test/r/rpl_replicate_do.result
+++ b/mysql-test/r/rpl_replicate_do.result
@@ -28,4 +28,4 @@ ERROR 42S02: Table 'test.t11' doesn't exist
 drop table if exists t1,t2,t11;
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	1617	#	#	master-bin.000001	Yes	Yes			test.t1				0		0	1617	#	None		0	No						#
+#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	1618	#	#	master-bin.000001	Yes	Yes			test.t1				0		0	1618	#	None		0	No						#
diff --git a/mysql-test/r/rpl_reset_slave.result b/mysql-test/r/rpl_reset_slave.result
index 6161f2112db..82e518c355c 100644
--- a/mysql-test/r/rpl_reset_slave.result
+++ b/mysql-test/r/rpl_reset_slave.result
@@ -6,12 +6,12 @@ drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	95	#	#	master-bin.000001	Yes	Yes							0		0	95	#	None		0	No						#
+#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	96	#	#	master-bin.000001	Yes	Yes							0		0	96	#	None		0	No						#
 stop slave;
 change master to master_user='test';
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-#	127.0.0.1	test	MASTER_PORT	1	master-bin.000001	95	#	#	master-bin.000001	No	No							0		0	95	#	None		0	No						#
+#	127.0.0.1	test	MASTER_PORT	1	master-bin.000001	96	#	#	master-bin.000001	No	No							0		0	96	#	None		0	No						#
 reset slave;
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
@@ -19,7 +19,7 @@ Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File
 start slave;
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	95	#	#	master-bin.000001	Yes	Yes							0		0	95	#	None		0	No						#
+#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	96	#	#	master-bin.000001	Yes	Yes							0		0	96	#	None		0	No						#
 stop slave;
 reset slave;
 start slave;
diff --git a/mysql-test/r/rpl_rotate_logs.result b/mysql-test/r/rpl_rotate_logs.result
index e675f8177ab..ec29a01db10 100644
--- a/mysql-test/r/rpl_rotate_logs.result
+++ b/mysql-test/r/rpl_rotate_logs.result
@@ -16,7 +16,7 @@ create table t1 (s text);
 insert into t1 values('Could not break slave'),('Tried hard');
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-#	127.0.0.1	root	MASTER_PORT	60	master-bin.000001	549	#	#	master-bin.000001	Yes	Yes							0		0	549	#	None		0	No						#
+#	127.0.0.1	root	MASTER_PORT	60	master-bin.000001	550	#	#	master-bin.000001	Yes	Yes							0		0	550	#	None		0	No						#
 select * from t1;
 s
 Could not break slave
@@ -57,7 +57,7 @@ master-bin.000003
 insert into t2 values (65);
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-#	127.0.0.1	root	MASTER_PORT	60	master-bin.000003	497	#	#	master-bin.000003	Yes	Yes							0		0	497	#	None		0	No						#
+#	127.0.0.1	root	MASTER_PORT	60	master-bin.000003	498	#	#	master-bin.000003	Yes	Yes							0		0	498	#	None		0	No						#
 select * from t2;
 m
 34
@@ -79,13 +79,13 @@ master-bin.000004
 master-bin.000005
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000005	2050		
+master-bin.000005	2051		
 select * from t4;
 a
 testing temporary tables part 2
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-#	127.0.0.1	root	MASTER_PORT	60	master-bin.000005	2050	#	#	master-bin.000005	Yes	Yes							0		0	2050	#	None		0	No						#
+#	127.0.0.1	root	MASTER_PORT	60	master-bin.000005	2051	#	#	master-bin.000005	Yes	Yes							0		0	2051	#	None		0	No						#
 lock tables t3 read;
 select count(*) from t3 where n >= 4;
 count(*)
diff --git a/mysql-test/r/rpl_server_id1.result b/mysql-test/r/rpl_server_id1.result
index ed24c0ef35b..fd8d73d5444 100644
--- a/mysql-test/r/rpl_server_id1.result
+++ b/mysql-test/r/rpl_server_id1.result
@@ -10,7 +10,7 @@ stop slave;
 change master to master_port=SLAVE_PORT;
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-	127.0.0.1	root	SLAVE_PORT	1		4	slave-relay-bin.000001	4		No	No						#	0		0	0	95	None		0	No						NULL
+	127.0.0.1	root	SLAVE_PORT	1		4	slave-relay-bin.000001	4		No	No						#	0		0	0	96	None		0	No						NULL
 start slave;
 insert into t1 values (1);
 show status like "slave_running";
diff --git a/mysql-test/r/rpl_server_id2.result b/mysql-test/r/rpl_server_id2.result
index 36a142166fa..7ca88521b22 100644
--- a/mysql-test/r/rpl_server_id2.result
+++ b/mysql-test/r/rpl_server_id2.result
@@ -10,7 +10,7 @@ stop slave;
 change master to master_port=SLAVE_PORT;
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-	127.0.0.1	root	SLAVE_PORT	1		4	slave-relay-bin.000001	4		No	No						#	0		0	0	95	None		0	No						NULL
+	127.0.0.1	root	SLAVE_PORT	1		4	slave-relay-bin.000001	4		No	No						#	0		0	0	96	None		0	No						NULL
 start slave;
 insert into t1 values (1);
 select * from t1;
diff --git a/mysql-test/r/rpl_temporary.result b/mysql-test/r/rpl_temporary.result
index 7d3ebd4ad32..9394c40c77f 100644
--- a/mysql-test/r/rpl_temporary.result
+++ b/mysql-test/r/rpl_temporary.result
@@ -38,19 +38,19 @@ f
 7
 show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	4	Format_desc	1	95	Server ver: VERSION, Binlog ver: 4
-master-bin.000001	95	Query	1	185	use `test`; drop table if exists t1,t2
-master-bin.000001	185	Query	1	271	use `test`; create table t1(f int)
-master-bin.000001	271	Query	1	357	use `test`; create table t2(f int)
-master-bin.000001	357	Query	1	483	use `test`; insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10)
-master-bin.000001	483	Query	1	579	use `test`; create temporary table t3(f int)
-master-bin.000001	579	Query	1	684	use `test`; insert into t3 select * from t1 where f<6
-master-bin.000001	684	Query	1	780	use `test`; create temporary table t3(f int)
-master-bin.000001	780	Query	1	882	use `test`; insert into t2 select count(*) from t3
-master-bin.000001	882	Query	1	988	use `test`; insert into t3 select * from t1 where f>=4
-master-bin.000001	988	Query	1	1075	use `test`; drop temporary table t3
-master-bin.000001	1075	Query	1	1177	use `test`; insert into t2 select count(*) from t3
-master-bin.000001	1177	Query	1	1264	use `test`; drop temporary table t3
+master-bin.000001	4	Format_desc	1	96	Server ver: VERSION, Binlog ver: 4
+master-bin.000001	96	Query	1	186	use `test`; drop table if exists t1,t2
+master-bin.000001	186	Query	1	272	use `test`; create table t1(f int)
+master-bin.000001	272	Query	1	358	use `test`; create table t2(f int)
+master-bin.000001	358	Query	1	484	use `test`; insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10)
+master-bin.000001	484	Query	1	580	use `test`; create temporary table t3(f int)
+master-bin.000001	580	Query	1	685	use `test`; insert into t3 select * from t1 where f<6
+master-bin.000001	685	Query	1	781	use `test`; create temporary table t3(f int)
+master-bin.000001	781	Query	1	883	use `test`; insert into t2 select count(*) from t3
+master-bin.000001	883	Query	1	989	use `test`; insert into t3 select * from t1 where f>=4
+master-bin.000001	989	Query	1	1076	use `test`; drop temporary table t3
+master-bin.000001	1076	Query	1	1178	use `test`; insert into t2 select count(*) from t3
+master-bin.000001	1178	Query	1	1265	use `test`; drop temporary table t3
 drop table t1, t2;
 use test;
 SET TIMESTAMP=1040323920;
diff --git a/mysql-test/r/rpl_timezone.result b/mysql-test/r/rpl_timezone.result
index ac219fe9d1c..d39b9f242bc 100644
--- a/mysql-test/r/rpl_timezone.result
+++ b/mysql-test/r/rpl_timezone.result
@@ -32,13 +32,13 @@ t
 2004-06-11 09:39:02
 show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	4	Format_desc	1	95	Server ver: VERSION, Binlog ver: 4
-master-bin.000001	95	Query	1	188	use `test`; create table t1 (t timestamp)
-master-bin.000001	188	Query	1	280	use `test`; create table t2 (t char(32))
-master-bin.000001	280	Query	1	372	use `test`; SET ONE_SHOT TIME_ZONE='UTC'
-master-bin.000001	372	Query	1	496	use `test`; insert into t1 values ('20040101000000'), ('20040611093902')
-master-bin.000001	496	Query	1	574	use `test`; delete from t1
-master-bin.000001	574	Query	1	698	use `test`; insert into t1 values ('20040101000000'), ('20040611093902')
+master-bin.000001	4	Format_desc	1	96	Server ver: VERSION, Binlog ver: 4
+master-bin.000001	96	Query	1	189	use `test`; create table t1 (t timestamp)
+master-bin.000001	189	Query	1	281	use `test`; create table t2 (t char(32))
+master-bin.000001	281	Query	1	373	use `test`; SET ONE_SHOT TIME_ZONE='UTC'
+master-bin.000001	373	Query	1	497	use `test`; insert into t1 values ('20040101000000'), ('20040611093902')
+master-bin.000001	497	Query	1	575	use `test`; delete from t1
+master-bin.000001	575	Query	1	699	use `test`; insert into t1 values ('20040101000000'), ('20040611093902')
 set time_zone='MET';
 insert into t2 (select t from t1);
 select * from t1;
diff --git a/mysql-test/r/rpl_until.result b/mysql-test/r/rpl_until.result
index 90ea94b89e6..1e1b1bbd44a 100644
--- a/mysql-test/r/rpl_until.result
+++ b/mysql-test/r/rpl_until.result
@@ -14,14 +14,14 @@ insert into t2 values (3),(4);
 drop table t2;
 show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	4	Format_desc	1	95	Server ver: VERSION, Binlog ver: 4
-master-bin.000001	95	Query	1	217	use `test`; create table t1(n int not null auto_increment primary key)
-master-bin.000001	217	Query	1	318	use `test`; insert into t1 values (1),(2),(3),(4)
-master-bin.000001	318	Query	1	395	use `test`; drop table t1
-master-bin.000001	395	Query	1	517	use `test`; create table t2(n int not null auto_increment primary key)
-master-bin.000001	517	Query	1	610	use `test`; insert into t2 values (1),(2)
-master-bin.000001	610	Query	1	703	use `test`; insert into t2 values (3),(4)
-master-bin.000001	703	Query	1	780	use `test`; drop table t2
+master-bin.000001	4	Format_desc	1	96	Server ver: VERSION, Binlog ver: 4
+master-bin.000001	96	Query	1	218	use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001	218	Query	1	319	use `test`; insert into t1 values (1),(2),(3),(4)
+master-bin.000001	319	Query	1	396	use `test`; drop table t1
+master-bin.000001	396	Query	1	518	use `test`; create table t2(n int not null auto_increment primary key)
+master-bin.000001	518	Query	1	611	use `test`; insert into t2 values (1),(2)
+master-bin.000001	611	Query	1	704	use `test`; insert into t2 values (3),(4)
+master-bin.000001	704	Query	1	781	use `test`; drop table t2
 start slave until master_log_file='master-bin.000001', master_log_pos=304;
 select * from t1;
 n
@@ -31,7 +31,7 @@ n
 4
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	780	slave-relay-bin.000004	#	master-bin.000001	Yes	No							0		0	318	#	Master	master-bin.000001	304	No						#
+#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	781	slave-relay-bin.000004	#	master-bin.000001	Yes	No							0		0	319	#	Master	master-bin.000001	304	No						#
 start slave until master_log_file='master-no-such-bin.000001', master_log_pos=291;
 select * from t1;
 n
@@ -41,7 +41,7 @@ n
 4
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	780	slave-relay-bin.000004	#	master-bin.000001	Yes	No							0		0	318	#	Master	master-no-such-bin.000001	291	No						#
+#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	781	slave-relay-bin.000004	#	master-bin.000001	Yes	No							0		0	319	#	Master	master-no-such-bin.000001	291	No						#
 start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=710;
 select * from t2;
 n
@@ -49,13 +49,13 @@ n
 2
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	780	slave-relay-bin.000004	#	master-bin.000001	Yes	No							0		0	610	#	Relay	slave-relay-bin.000004	710	No						#
+#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	781	slave-relay-bin.000004	#	master-bin.000001	Yes	No							0		0	611	#	Relay	slave-relay-bin.000004	710	No						#
 start slave;
 stop slave;
 start slave until master_log_file='master-bin.000001', master_log_pos=710;
 show slave status;
 Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master
-#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	780	slave-relay-bin.000004	#	master-bin.000001	Yes	No							0		0	780	#	Master	master-bin.000001	710	No						#
+#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	781	slave-relay-bin.000004	#	master-bin.000001	Yes	No							0		0	781	#	Master	master-bin.000001	710	No						#
 start slave until master_log_file='master-bin', master_log_pos=561;
 ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
 start slave until master_log_file='master-bin.000001', master_log_pos=561, relay_log_pos=12;
diff --git a/mysql-test/r/rpl_user_variables.result b/mysql-test/r/rpl_user_variables.result
index 2e39f1f6422..0d6c717442e 100644
--- a/mysql-test/r/rpl_user_variables.result
+++ b/mysql-test/r/rpl_user_variables.result
@@ -76,35 +76,35 @@ abcn1n2
 NULL
 NULL
 NULL
-show binlog events from 95;
+show binlog events from 96;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-bin.000001	95	Query	1	186	use `test`; create table t1(n char(30))
-slave-bin.000001	186	User var	2	229	@`i1`=12345678901234
-slave-bin.000001	229	User var	2	272	@`i2`=-12345678901234
-slave-bin.000001	272	User var	2	315	@`i3`=0
-slave-bin.000001	315	User var	2	358	@`i4`=-1
-slave-bin.000001	358	Query	1	470	use `test`; insert into t1 values (@i1), (@i2), (@i3), (@i4)
-slave-bin.000001	470	User var	2	509	@`r1`=12.5
-slave-bin.000001	509	User var	2	548	@`r2`=-12.5
-slave-bin.000001	548	Query	1	646	use `test`; insert into t1 values (@r1), (@r2)
-slave-bin.000001	646	User var	2	695	@`s1`=_latin1 0x5468697320697320612074657374 COLLATE latin1_swedish_ci
-slave-bin.000001	695	User var	2	730	@`s2`=_latin1 "" COLLATE latin1_swedish_ci
-slave-bin.000001	730	User var	2	772	@`s3`=_latin1 0x61626327646566 COLLATE latin1_swedish_ci
-slave-bin.000001	772	User var	2	814	@`s4`=_latin1 0x6162635C646566 COLLATE latin1_swedish_ci
-slave-bin.000001	814	User var	2	856	@`s5`=_latin1 0x61626327646566 COLLATE latin1_swedish_ci
-slave-bin.000001	856	Query	1	975	use `test`; insert into t1 values (@s1), (@s2), (@s3), (@s4), (@s5)
-slave-bin.000001	975	User var	2	1001	@`n1`=NULL
-slave-bin.000001	1001	Query	1	1092	use `test`; insert into t1 values (@n1)
-slave-bin.000001	1092	User var	2	1118	@`n2`=NULL
-slave-bin.000001	1118	Query	1	1209	use `test`; insert into t1 values (@n2)
-slave-bin.000001	1209	Query	1	1326	use `test`; insert into t1 values (@a:=0), (@a:=@a+1), (@a:=@a+1)
-slave-bin.000001	1326	User var	2	1368	@`a`=2
-slave-bin.000001	1368	Query	1	1469	use `test`; insert into t1 values (@a+(@b:=@a+1))
-slave-bin.000001	1469	User var	2	1506	@`q`=_latin1 0x616263 COLLATE latin1_swedish_ci
-slave-bin.000001	1506	Query	1	1639	use `test`; insert t1 values (@q), (@q:=concat(@q, 'n1')), (@q:=concat(@q, 'n2'))
-slave-bin.000001	1639	User var	2	1681	@`a`=5
-slave-bin.000001	1681	Query	1	1776	use `test`; insert into t1 values (@a),(@a)
-slave-bin.000001	1776	User var	2	1801	@`a`=NULL
-slave-bin.000001	1801	Query	1	1903	use `test`; insert into t1 values (@a),(@a),(@a*5)
+slave-bin.000001	96	Query	1	187	use `test`; create table t1(n char(30))
+slave-bin.000001	187	User var	2	230	@`i1`=12345678901234
+slave-bin.000001	230	User var	2	273	@`i2`=-12345678901234
+slave-bin.000001	273	User var	2	316	@`i3`=0
+slave-bin.000001	316	User var	2	359	@`i4`=-1
+slave-bin.000001	359	Query	1	471	use `test`; insert into t1 values (@i1), (@i2), (@i3), (@i4)
+slave-bin.000001	471	User var	2	510	@`r1`=12.5
+slave-bin.000001	510	User var	2	549	@`r2`=-12.5
+slave-bin.000001	549	Query	1	647	use `test`; insert into t1 values (@r1), (@r2)
+slave-bin.000001	647	User var	2	696	@`s1`=_latin1 0x5468697320697320612074657374 COLLATE latin1_swedish_ci
+slave-bin.000001	696	User var	2	731	@`s2`=_latin1 "" COLLATE latin1_swedish_ci
+slave-bin.000001	731	User var	2	773	@`s3`=_latin1 0x61626327646566 COLLATE latin1_swedish_ci
+slave-bin.000001	773	User var	2	815	@`s4`=_latin1 0x6162635C646566 COLLATE latin1_swedish_ci
+slave-bin.000001	815	User var	2	857	@`s5`=_latin1 0x61626327646566 COLLATE latin1_swedish_ci
+slave-bin.000001	857	Query	1	976	use `test`; insert into t1 values (@s1), (@s2), (@s3), (@s4), (@s5)
+slave-bin.000001	976	User var	2	1002	@`n1`=NULL
+slave-bin.000001	1002	Query	1	1093	use `test`; insert into t1 values (@n1)
+slave-bin.000001	1093	User var	2	1119	@`n2`=NULL
+slave-bin.000001	1119	Query	1	1210	use `test`; insert into t1 values (@n2)
+slave-bin.000001	1210	Query	1	1327	use `test`; insert into t1 values (@a:=0), (@a:=@a+1), (@a:=@a+1)
+slave-bin.000001	1327	User var	2	1369	@`a`=2
+slave-bin.000001	1369	Query	1	1470	use `test`; insert into t1 values (@a+(@b:=@a+1))
+slave-bin.000001	1470	User var	2	1507	@`q`=_latin1 0x616263 COLLATE latin1_swedish_ci
+slave-bin.000001	1507	Query	1	1640	use `test`; insert t1 values (@q), (@q:=concat(@q, 'n1')), (@q:=concat(@q, 'n2'))
+slave-bin.000001	1640	User var	2	1682	@`a`=5
+slave-bin.000001	1682	Query	1	1777	use `test`; insert into t1 values (@a),(@a)
+slave-bin.000001	1777	User var	2	1802	@`a`=NULL
+slave-bin.000001	1802	Query	1	1904	use `test`; insert into t1 values (@a),(@a),(@a*5)
 drop table t1;
 stop slave;
diff --git a/mysql-test/r/user_var.result b/mysql-test/r/user_var.result
index bacd8311a1e..511ef5e3188 100644
--- a/mysql-test/r/user_var.result
+++ b/mysql-test/r/user_var.result
@@ -174,14 +174,15 @@ INSERT INTO t1 VALUES(@`a b`);
 set @var1= "';aaa";
 SET @var2=char(ascii('a'));
 insert into t1 values (@var1),(@var2);
-show binlog events from 95;
+show binlog events from 96;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	95	User var	1	136	@`a b`=_latin1 0x68656C6C6F COLLATE latin1_swedish_ci
-master-bin.000001	136	Query	1	229	use `test`; INSERT INTO t1 VALUES(@`a b`)
-master-bin.000001	229	User var	1	271	@`var1`=_latin1 0x273B616161 COLLATE latin1_swedish_ci
-master-bin.000001	271	User var	1	309	@`var2`=_latin1 0x61 COLLATE latin1_swedish_ci
-master-bin.000001	309	Query	1	410	use `test`; insert into t1 values (@var1),(@var2)
+master-bin.000001	96	User var	1	137	@`a b`=_latin1 0x68656C6C6F COLLATE latin1_swedish_ci
+master-bin.000001	137	Query	1	230	use `test`; INSERT INTO t1 VALUES(@`a b`)
+master-bin.000001	230	User var	1	272	@`var1`=_latin1 0x273B616161 COLLATE latin1_swedish_ci
+master-bin.000001	272	User var	1	310	@`var2`=_latin1 0x61 COLLATE latin1_swedish_ci
+master-bin.000001	310	Query	1	411	use `test`; insert into t1 values (@var1),(@var2)
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
+ROLLBACK;
 SET @`a b`:=_latin1 0x68656C6C6F COLLATE `latin1_swedish_ci`;
 use test;
 SET TIMESTAMP=10000;
diff --git a/mysql-test/t/ctype_ucs.test b/mysql-test/t/ctype_ucs.test
index 954c4a8d8ab..7d34c4504bd 100644
--- a/mysql-test/t/ctype_ucs.test
+++ b/mysql-test/t/ctype_ucs.test
@@ -338,7 +338,7 @@ 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 95;
+show binlog events from 96;
 # more important than SHOW BINLOG EVENTS, mysqlbinlog (where we
 # absolutely need variables names to be quoted and strings to be
 # escaped).
diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test
index da27fcfc734..d3f775bb3a8 100644
--- a/mysql-test/t/innodb.test
+++ b/mysql-test/t/innodb.test
@@ -139,7 +139,7 @@ select n from t1;
 rollback to savepoint `savept2`;
 release savepoint `my_savepoint`;
 select n from t1;
--- error 1181
+-- error 1305
 rollback to savepoint `my_savepoint`;
 set autocommit=1;
 # nop
diff --git a/mysql-test/t/mix_innodb_myisam_binlog.test b/mysql-test/t/mix_innodb_myisam_binlog.test
index 11d3af11c42..08a81c850eb 100644
--- a/mysql-test/t/mix_innodb_myisam_binlog.test
+++ b/mysql-test/t/mix_innodb_myisam_binlog.test
@@ -26,7 +26,8 @@ insert into t2 select * from t1;
 commit;
 
 --replace_column 5 #
-show binlog events from 95;
+--replace_result "xid=12" "xid=7"
+show binlog events from 96;
 
 delete from t1;
 delete from t2;
@@ -39,7 +40,7 @@ insert into t2 select * from t1;
 rollback;
 
 --replace_column 5 #
-show binlog events from 95;
+show binlog events from 96;
 
 delete from t1;
 delete from t2;
@@ -54,7 +55,8 @@ rollback to savepoint my_savepoint;
 commit;
 
 --replace_column 5 #
-show binlog events from 95;
+--replace_result "xid=45" "xid=24"
+show binlog events from 96;
 
 delete from t1;
 delete from t2;
@@ -71,7 +73,8 @@ commit;
 select a from t1 order by a; # check that savepoints work :)
 
 --replace_column 5 #
-show binlog events from 95;
+--replace_result "xid=67" "xid=36"
+show binlog events from 96;
 
 # and when ROLLBACK is not explicit?
 delete from t1;
@@ -92,7 +95,7 @@ connection con2;
 # logging has been done, we use a user lock.
 select get_lock("a",10);
 --replace_column 5 #
-show binlog events from 95;
+show binlog events from 96;
 
 # and when not in a transact1on?
 delete from t1;
@@ -103,7 +106,8 @@ insert into t1 values(9);
 insert into t2 select * from t1;
 
 --replace_column 5 #
-show binlog events from 95;
+--replace_result "xid=116" "xid=59"
+show binlog events from 96;
 
 # Check that when the query updat1ng the MyISAM table is the first in the
 # transaction, we log it immediately.
@@ -115,12 +119,14 @@ insert into t1 values(10); # first make t1 non-empty
 begin;
 insert into t2 select * from t1;
 --replace_column 5 #
-show binlog events from 95;
+--replace_result "xid=130" "xid=65"
+show binlog events from 96;
 insert into t1 values(11);
 commit;
 
 --replace_column 5 #
-show binlog events from 95;
+--replace_result "xid=130" "xid=65" "xid=133" "xid=67"
+show binlog events from 96;
 
 
 # Check that things work like before this BEGIN/ROLLBACK code was added,
@@ -138,7 +144,8 @@ insert into t2 select * from t1;
 commit;
 
 --replace_column 5 #
-show binlog events from 95;
+--replace_result "xid=152" "xid=77"
+show binlog events from 96;
 
 delete from t1;
 delete from t2;
@@ -150,7 +157,7 @@ insert into t2 select * from t1;
 rollback;
 
 --replace_column 5 #
-show binlog events from 95;
+show binlog events from 96;
 
 delete from t1;
 delete from t2;
@@ -165,7 +172,8 @@ rollback to savepoint my_savepoint;
 commit;
 
 --replace_column 5 #
-show binlog events from 95;
+--replace_result "xid=184" "xid=93"
+show binlog events from 96;
 
 delete from t1;
 delete from t2;
@@ -182,7 +190,8 @@ commit;
 select a from t1 order by a; # check that savepoints work :)
 
 --replace_column 5 #
-show binlog events from 95;
+--replace_result "xid=205" "xid=104"
+show binlog events from 96;
 
 # Test for BUG#5714, where a MyISAM update in the transaction used to
 # release row-level locks in InnoDB
diff --git a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test
index 7f0a963adde..3f2ab2b31ec 100644
--- a/mysql-test/t/mysqlbinlog.test
+++ b/mysql-test/t/mysqlbinlog.test
@@ -61,7 +61,7 @@ select "--- --database --" as "";
 select "--- --position --" as "";
 --enable_query_log
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---exec $MYSQL_BINLOG --short-form --local-load=$MYSQL_TEST_DIR/var/tmp/ --position=118 $MYSQL_TEST_DIR/var/log/master-bin.000002
+--exec $MYSQL_BINLOG --short-form --local-load=$MYSQL_TEST_DIR/var/tmp/ --position=119 $MYSQL_TEST_DIR/var/log/master-bin.000002
 
 # These are tests for remote binlog.
 # They should return the same as previous test.
@@ -93,7 +93,7 @@ select "--- --database --" as "";
 select "--- --position --" as "";
 --enable_query_log
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---exec $MYSQL_BINLOG --short-form --local-load=$MYSQL_TEST_DIR/var/tmp/ --read-from-remote-server --position=118 --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002
+--exec $MYSQL_BINLOG --short-form --local-load=$MYSQL_TEST_DIR/var/tmp/ --read-from-remote-server --position=119 --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002
 
 # Bug#7853 (mysqlbinlog does not accept input from stdin)
 --disable_query_log
@@ -107,3 +107,4 @@ select "--- reading stdin --" as "";
 
 # clean up
 drop table t1, t2;
+
diff --git a/mysql-test/t/mysqlbinlog2.test b/mysql-test/t/mysqlbinlog2.test
index 6a4c99c746d..f2360d51c16 100644
--- a/mysql-test/t/mysqlbinlog2.test
+++ b/mysql-test/t/mysqlbinlog2.test
@@ -46,11 +46,11 @@ select "--- offset --" as "";
 --disable_query_log
 select "--- start-position --" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form --start-position=601 $MYSQL_TEST_DIR/var/log/master-bin.000001 
+--exec $MYSQL_BINLOG --short-form --start-position=602 $MYSQL_TEST_DIR/var/log/master-bin.000001 
 --disable_query_log
 select "--- stop-position --" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form --stop-position=601 $MYSQL_TEST_DIR/var/log/master-bin.000001 
+--exec $MYSQL_BINLOG --short-form --stop-position=602 $MYSQL_TEST_DIR/var/log/master-bin.000001 
 --disable_query_log
 select "--- start-datetime --" as "";
 --enable_query_log
@@ -75,11 +75,11 @@ select "--- offset --" as "";
 --disable_query_log
 select "--- start-position --" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form --start-position=601 $MYSQL_TEST_DIR/var/log/master-bin.000001 $MYSQL_TEST_DIR/var/log/master-bin.000002
+--exec $MYSQL_BINLOG --short-form --start-position=602 $MYSQL_TEST_DIR/var/log/master-bin.000001 $MYSQL_TEST_DIR/var/log/master-bin.000002
 --disable_query_log
 select "--- stop-position --" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form --stop-position=123 $MYSQL_TEST_DIR/var/log/master-bin.000001 $MYSQL_TEST_DIR/var/log/master-bin.000002
+--exec $MYSQL_BINLOG --short-form --stop-position=124 $MYSQL_TEST_DIR/var/log/master-bin.000001 $MYSQL_TEST_DIR/var/log/master-bin.000002
 --disable_query_log
 select "--- start-datetime --" as "";
 --enable_query_log
@@ -102,11 +102,11 @@ select "--- offset --" as "";
 --disable_query_log
 select "--- start-position --" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form --start-position=601 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 
+--exec $MYSQL_BINLOG --short-form --start-position=602 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 
 --disable_query_log
 select "--- stop-position --" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form --stop-position=601 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 
+--exec $MYSQL_BINLOG --short-form --stop-position=602 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 
 --disable_query_log
 select "--- start-datetime --" as "";
 --enable_query_log
@@ -129,11 +129,11 @@ select "--- offset --" as "";
 --disable_query_log
 select "--- start-position --" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form --start-position=601 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001  master-bin.000002
+--exec $MYSQL_BINLOG --short-form --start-position=602 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001  master-bin.000002
 --disable_query_log
 select "--- stop-position --" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form --stop-position=123 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001  master-bin.000002
+--exec $MYSQL_BINLOG --short-form --stop-position=124 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001  master-bin.000002
 --disable_query_log
 select "--- start-datetime --" as "";
 --enable_query_log
diff --git a/mysql-test/t/rpl_charset.test b/mysql-test/t/rpl_charset.test
index e8a12ff8317..c61df09fdcc 100644
--- a/mysql-test/t/rpl_charset.test
+++ b/mysql-test/t/rpl_charset.test
@@ -107,7 +107,7 @@ connection master;
 drop database mysqltest2;
 drop database mysqltest3;
 --replace_column 2 # 5 #
-show binlog events from 95;
+show binlog events from 96;
 sync_slave_with_master;
 
 # Check that we can change global.collation_server (since 5.0.3)
@@ -156,3 +156,4 @@ connection master;
 --exec $MYSQL_BINLOG --short-form $MYSQL_TEST_DIR/var/log/master-bin.000001 
 drop table t1;
 sync_slave_with_master;
+
diff --git a/mysql-test/t/rpl_error_ignored_table.test b/mysql-test/t/rpl_error_ignored_table.test
index 487869e5fef..a520024b7da 100644
--- a/mysql-test/t/rpl_error_ignored_table.test
+++ b/mysql-test/t/rpl_error_ignored_table.test
@@ -48,7 +48,7 @@ connection master;
 --error 0,1053;
 reap;
 connection master1;
-show binlog events from 95;
+show binlog events from 96;
 save_master_pos;
 connection slave;
 # SQL slave thread should not have stopped (because table of the killed
diff --git a/mysql-test/t/rpl_loaddata_rule_m.test b/mysql-test/t/rpl_loaddata_rule_m.test
index 3f19a09c6f7..ff00e8f4925 100644
--- a/mysql-test/t/rpl_loaddata_rule_m.test
+++ b/mysql-test/t/rpl_loaddata_rule_m.test
@@ -19,5 +19,5 @@ create database mysqltest;
 create table t1(a int, b int, unique(b));
 use mysqltest;
 load data infile '../../std_data/rpl_loaddata.dat' into table test.t1;
-show binlog events from 95; # should be nothing
+show binlog events from 96; # should be nothing
 drop database mysqltest;
diff --git a/mysql-test/t/rpl_loaddata_rule_s.test b/mysql-test/t/rpl_loaddata_rule_s.test
index 8163cd20f00..71a3929da32 100644
--- a/mysql-test/t/rpl_loaddata_rule_s.test
+++ b/mysql-test/t/rpl_loaddata_rule_s.test
@@ -17,4 +17,4 @@ save_master_pos;
 connection slave;
 sync_with_master;
 select count(*) from t1; # check that LOAD was replicated
-show binlog events from 95; # should be nothing
+show binlog events from 96; # should be nothing
diff --git a/mysql-test/t/rpl_log.test b/mysql-test/t/rpl_log.test
index 178199d6160..055c1a7c93a 100644
--- a/mysql-test/t/rpl_log.test
+++ b/mysql-test/t/rpl_log.test
@@ -38,9 +38,9 @@ select count(*) from t1;
 drop table t1;
 --replace_result $VERSION VERSION
 show binlog events;
-show binlog events from 95 limit 1;
-show binlog events from 95 limit 2;
-show binlog events from 95 limit 2,1;
+show binlog events from 96 limit 1;
+show binlog events from 96 limit 2;
+show binlog events from 96 limit 2,1;
 flush logs;
 
 # We need an extra update before doing save_master_pos.
diff --git a/mysql-test/t/rpl_log_pos.test b/mysql-test/t/rpl_log_pos.test
index 634bf9449fd..c9d7056924f 100644
--- a/mysql-test/t/rpl_log_pos.test
+++ b/mysql-test/t/rpl_log_pos.test
@@ -38,7 +38,7 @@ insert into t1 values (1),(2),(3);
 save_master_pos;
 connection slave;
 stop slave;
-change master to master_log_pos=95;
+change master to master_log_pos=96;
 start slave;
 sync_with_master;
 select * from t1;
diff --git a/mysql-test/t/rpl_user_variables.test b/mysql-test/t/rpl_user_variables.test
index c0327a7ddb3..47bc9de37ba 100644
--- a/mysql-test/t/rpl_user_variables.test
+++ b/mysql-test/t/rpl_user_variables.test
@@ -46,7 +46,7 @@ save_master_pos;
 connection slave;
 sync_with_master;
 select * from t1;
-show binlog events from 95;
+show binlog events from 96;
 connection master;
 drop table t1;
 save_master_pos;
diff --git a/mysql-test/t/strict.test b/mysql-test/t/strict.test
index 7da07f267b2..d8833f6f914 100644
--- a/mysql-test/t/strict.test
+++ b/mysql-test/t/strict.test
@@ -866,12 +866,12 @@ DROP TABLE t1;
 
 CREATE TABLE t1 (col1 CHAR(5), col2 VARCHAR(6));
 INSERT INTO t1 VALUES ('hello', 'hello'),('he', 'he'),('hello   ', 'hello ');
---error 1400
+--error 1406
 INSERT INTO t1 (col1) VALUES ('hellobob');
 --error 1265
 INSERT INTO t1 (col2) VALUES ('hellobob');
 INSERT INTO t1 (col2) VALUES ('hello  ');
---error 1400
+--error 1406
 UPDATE t1 SET col1 ='hellobob' WHERE col1 ='he';
 --error 1265
 UPDATE t1 SET col2 ='hellobob' WHERE col2 ='he';
diff --git a/mysql-test/t/user_var.test b/mysql-test/t/user_var.test
index 49cf981b966..5dc24bde21f 100644
--- a/mysql-test/t/user_var.test
+++ b/mysql-test/t/user_var.test
@@ -110,7 +110,7 @@ INSERT INTO t1 VALUES(@`a b`);
 set @var1= "';aaa";
 SET @var2=char(ascii('a'));
 insert into t1 values (@var1),(@var2);
-show binlog events from 95;
+show binlog events from 96;
 # more important than SHOW BINLOG EVENTS, mysqlbinlog (where we
 # absolutely need variables names to be quoted and strings to be
 # escaped).
author	unknown <serg@serg.mylan>	2005-02-17 14:00:44 +0100
committer	unknown <serg@serg.mylan>	2005-02-17 14:00:44 +0100
commit	7aa1d93fd480dfa0a416a85284a4fd62cc0c9b88 (patch)
tree	2286825455d6ff56f96a8bcd52bbb6737ebcd354 /mysql-test
parent	d6541adb37068d6545fd6f871e4dd63fa8b1e90a (diff)
parent	c5c497164fbc48bcc50770ced833a07788082aaf (diff)
download	mariadb-git-7aa1d93fd480dfa0a416a85284a4fd62cc0c9b88.tar.gz