manually merged

client/mysqlbinlog.cc:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
mysql-test/include/varchar.inc:
  Auto merged
mysql-test/r/bdb.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/mysqlbinlog2.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/user_var.test:
  Auto merged
mysys/hash.c:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/slave.h:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_repl.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
mysql-test/r/ctype_ucs.result:
  ul
mysql-test/r/drop_temp_table.result:
  ul
mysql-test/r/innodb.result:
  ul
mysql-test/r/insert_select.result:
  ul
mysql-test/r/mix_innodb_myisam_binlog.result:
  ul
mysql-test/r/rpl_change_master.result:
  ul
mysql-test/r/rpl_charset.result:
  ul
mysql-test/r/rpl_error_ignored_table.result:
  ul
mysql-test/r/rpl_flush_log_loop.result:
  ul
mysql-test/r/rpl_flush_tables.result:
  ul
mysql-test/r/rpl_loaddata.result:
  ul
mysql-test/r/rpl_loaddata_rule_m.result:
  ul
mysql-test/r/rpl_log.result:
  ul
mysql-test/r/rpl_max_relay_size.result:
  ul
mysql-test/r/rpl_relayrotate.result:
  ul
mysql-test/r/rpl_replicate_do.result:
  ul
mysql-test/r/rpl_rotate_logs.result:
  ul
mysql-test/r/rpl_temporary.result:
  ul
mysql-test/r/rpl_timezone.result:
  ul
mysql-test/r/rpl_until.result:
  ul
mysql-test/r/rpl_user_variables.result:
  ul
mysql-test/r/user_var.result:
  ul

client/mysqlbinlog.cc

@@ -1169,7 +1169,14 @@ static int dump_local_log_entries(const char* logname)
     Log_event* ev = Log_event::read_log_event(file, description_event);
     if (!ev)
     {
-      if (file->error)
+      /*
+        if binlog wasn't closed properly ("in use" flag is set) don't complain
+        about a corruption, but issue a "ROLLBACK" to annihilate half-logged
+        transaction. Otherwise, treat it as EOF and move to the next binlog.
+      */
+      if (description_event->flags & LOG_EVENT_BINLOG_IN_USE_F)
+        fprintf(result_file, "ROLLBACK;\n");
+      else if (file->error)
       {
         fprintf(stderr,
                 "Could not read entry at offset %s:"

configure.in

@@ -1887,7 +1887,7 @@ AC_CHECK_FUNCS(alarm bcmp bfill bmove bzero chsize cuserid fchmod fcntl \
   getcwd gethostbyaddr_r gethostbyname_r getpass getpassphrase getpwnam \
   getpwuid getrlimit getrusage getwd gmtime_r index initgroups isnan \
   localtime_r locking longjmp lrand48 madvise mallinfo memcpy memmove \
-  mkstemp mlockall perror poll pread pthread_attr_create mmap \
+  mkstemp mlockall perror poll pread pthread_attr_create mmap getpagesize \
   pthread_attr_getstacksize pthread_attr_setprio pthread_attr_setschedparam \
   pthread_attr_setstacksize pthread_condattr_create pthread_getsequence_np \
   pthread_key_delete pthread_rwlock_rdlock pthread_setprio \

include/my_global.h

@@ -761,7 +761,7 @@ typedef long		int32;
 #endif
 typedef unsigned long	uint32; /* Short for unsigned integer >= 32 bits */
 #else
-error "Neither int or long is of 4 bytes width"
+#error "Neither int or long is of 4 bytes width"
 #endif
 
 #if !defined(HAVE_ULONG) && !defined(HAVE_LINUXTHREADS) && !defined(__USE_MISC)

include/my_pthread.h

@@ -689,12 +689,12 @@ extern pthread_t shutdown_th, main_th, signal_th;
 #define thread_safe_add(V,C,L) (pthread_mutex_lock((L)), (V)+=(C), pthread_mutex_unlock((L)))
 #define thread_safe_sub(V,C,L) \
         (pthread_mutex_lock((L)), (V)-=(C), pthread_mutex_unlock((L)))
-#if defined (__GNUC__) || defined (__cplusplus)
-static inline bool thread_safe_dec_and_test(ulong V, pthread_mutex_t *L)
+#ifdef __cplusplus
+static inline bool thread_safe_dec_and_test(ulong &V, pthread_mutex_t *L)
 {
   ulong res;
   pthread_mutex_lock(L);
-  res=V--;
+  res=--V;
   pthread_mutex_unlock(L);
   return res==0;
 }

innobase/include/trx0sys.ic

@@ -325,7 +325,8 @@ trx_is_active(
 	}
 
 	trx = trx_get_on_id(trx_id);
-	if (trx && (trx->conc_state == TRX_ACTIVE)) {
+        if (trx && (trx->conc_state == TRX_ACTIVE ||
+                        trx->conc_state == TRX_PREPARED)) {
 
 		return(TRUE);
 	}

innobase/read/read0read.c

@@ -153,7 +153,8 @@ read_view_open_now(
 	/* No active transaction should be visible, except cr_trx */
 
 	while (trx) {
-		if (trx != cr_trx && trx->conc_state == TRX_ACTIVE) {
+                if (trx != cr_trx && (trx->conc_state == TRX_ACTIVE ||
+                                        trx->conc_state == TRX_PREPARED)) {
 
 			read_view_set_nth_trx_id(view, n, trx->id);
 

innobase/trx/trx0trx.c

@@ -1622,6 +1622,7 @@ trx_print(
 			fputs(", not started", f);
 			break;
 		case TRX_ACTIVE:
+		case TRX_PREPARED:
 			fprintf(f, ", ACTIVE %lu sec",
 				(ulong)difftime(time(NULL), trx->start_time));
                         break;

mysql-test/r/ctype_ucs.result

@@ -523,104 +523,16 @@ 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	219	use `test`; insert into t2 values (@v)
+flush logs;
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
-SET @`v`:=_ucs2 0x006100620063 COLLATE `ucs2_general_ci`;
+SET @`v`:=_ucs2 0x006100620063 COLLATE ucs2_general_ci;
 use test;
 SET TIMESTAMP=10000;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
 SET @@session.sql_mode=0;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
 insert into t2 values (@v);
 drop table t2;
-set names latin1;
-create table t1 (a enum('x','y','z') character set ucs2);
-show create table t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `a` enum('x','y','z') character set ucs2 default NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
-insert into t1 values ('x');
-insert into t1 values ('y');
-insert into t1 values ('z');
-select a, hex(a) from t1 order by a;
-a	hex(a)
-x	0078
-y	0079
-z	007A
-alter table t1 change a a enum('x','y','z','d','e','','','') character set ucs2;
-show create table t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `a` enum('x','y','z','d','e','','','') character set ucs2 default NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
-insert into t1 values ('D');
-insert into t1 values ('E ');
-insert into t1 values ('');
-insert into t1 values ('');
-insert into t1 values ('');
-select a, hex(a) from t1 order by a;
-a	hex(a)
-x	0078
-y	0079
-z	007A
-d	0064
-e	0065
-	00E4
-	00F6
-	00FC
-drop table t1;
-create table t1 (a set ('x','y','z','','','') character set ucs2);
-show create table t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `a` set('x','y','z','','','') character set ucs2 default NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
-insert into t1 values ('x');
-insert into t1 values ('y');
-insert into t1 values ('z');
-insert into t1 values ('x,y');
-insert into t1 values ('x,y,z,,,');
-select a, hex(a) from t1 order by a;
-a	hex(a)
-x	0078
-y	0079
-x,y	0078002C0079
-z	007A
-x,y,z,,,	0078002C0079002C007A002C00E4002C00F6002C00FC
-drop table t1;
-create table t1(a enum('a','b','c')) default character set ucs2;
-insert into t1 values('a'),('b'),('c');
-alter table t1 add b char(1);
-show warnings;
-Level	Code	Message
-select * from t1 order by a;
-a	b
-a	NULL
-b	NULL
-c	NULL
-drop table t1;
-SET collation_connection='ucs2_general_ci';
-create table t1 select repeat('a',4000) a;
-delete from t1;
-insert into t1 values ('a'), ('a '), ('a\t');
-select collation(a),hex(a) from t1 order by a;
-collation(a)	hex(a)
-ucs2_general_ci	00610009
-ucs2_general_ci	0061
-ucs2_general_ci	00610020
-drop table t1;
-SET NAMES latin1;
-SET collation_connection='ucs2_bin';
-create table t1 select repeat('a',4000) a;
-delete from t1;
-insert into t1 values ('a'), ('a '), ('a\t');
-select collation(a),hex(a) from t1 order by a;
-collation(a)	hex(a)
-ucs2_bin	00610009
-ucs2_bin	0061
-ucs2_bin	00610020
-drop table t1;

mysql-test/r/drop_temp_table.result

 reset master;
 create database `drop-temp+table-test`;
 use `drop-temp+table-test`;
-create temporary table shortn1 (a int);
 create temporary table `table:name` (a int);
-create temporary table shortn2 (a int);
 select get_lock("a",10);
 get_lock("a",10)
 1
@@ -12,13 +10,9 @@ get_lock("a",10)
 1
 show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Format_desc	1	#	Server ver: VERSION, Binlog ver: 4
-master-bin.000001	#	Query	1	#	create database `drop-temp+table-test`
-master-bin.000001	#	Query	1	#	use `drop-temp+table-test`; create temporary table shortn1 (a int)
-master-bin.000001	#	Query	1	#	use `drop-temp+table-test`; create temporary table `table:name` (a int)
-master-bin.000001	#	Query	1	#	use `drop-temp+table-test`; create temporary table shortn2 (a int)
-master-bin.000001	#	Query	1	#	use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `drop-temp+table-test`.`shortn2`
-master-bin.000001	#	Query	1	#	use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `drop-temp+table-test`.`table:name`
-master-bin.000001	#	Query	1	#	use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `drop-temp+table-test`.`shortn1`
-master-bin.000001	#	Query	1	#	use `drop-temp+table-test`; DO RELEASE_LOCK("a")
+master-bin.000001	4	Format_desc	1	96	Server ver: VERSION, Binlog ver: 4
+master-bin.000001	96	Query	1	207	create database `drop-temp+table-test`
+master-bin.000001	207	Query	1	323	use `drop-temp+table-test`; create temporary table `table:name` (a int)
+master-bin.000001	323	Query	1	474	use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `drop-temp+table-test`.`table:name`
+master-bin.000001	474	Query	1	567	use `drop-temp+table-test`; DO RELEASE_LOCK("a")
 drop database `drop-temp+table-test`;

mysql-test/r/innodb.result

@@ -249,30 +249,6 @@ n
 4
 5
 6
-set autocommit=0;
-begin;
-savepoint `my_savepoint`;
-insert into t1 values (7);
-savepoint `savept2`;
-insert into t1 values (3);
-select n from t1;
-n
-3
-4
-5
-6
-7
-rollback to savepoint `savept2`;
-release savepoint `my_savepoint`;
-select n from t1;
-n
-4
-5
-6
-7
-rollback to savepoint `my_savepoint`;
-ERROR HY000: Got error 153 during ROLLBACK
-set autocommit=1;
 rollback;
 drop table t1;
 create table t1 (n int not null primary key) engine=innodb;
@@ -1350,8 +1326,8 @@ truncate table t1;
 insert into t1 (a) values (NULL),(NULL);
 SELECT * from t1;
 a
-1
-2
+3
+4
 drop table t1;
 CREATE TABLE t1 (`id 1` INT NOT NULL, PRIMARY KEY (`id 1`)) ENGINE=INNODB;
 CREATE TABLE t2 (id INT PRIMARY KEY, t1_id INT, INDEX par_ind (t1_id), FOREIGN KEY (`t1_id`) REFERENCES `t1`(`id 1`)  ON DELETE CASCADE ) ENGINE=INNODB;
@@ -1445,19 +1421,19 @@ insert t2 select * from t1;
 insert t3 select * from t1;
 checksum table t1, t2, t3, t4 quick;
 Table	Checksum
-test.t1	2948697075
+test.t1	272226711
 test.t2	NULL
 test.t3	NULL
 test.t4	NULL
 checksum table t1, t2, t3, t4;
 Table	Checksum
-test.t1	2948697075
+test.t1	272226711
 test.t2	968604391
 test.t3	968604391
 test.t4	NULL
 checksum table t1, t2, t3, t4 extended;
 Table	Checksum
-test.t1	3092701434
+test.t1	272226711
 test.t2	968604391
 test.t3	968604391
 test.t4	NULL
@@ -1633,14 +1609,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	150
 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	151
 show status like "binlog_cache_disk_use";
 Variable_name	Value
 Binlog_cache_disk_use	1
@@ -1649,7 +1625,7 @@ delete from t1;
 commit;
 show status like "binlog_cache_use";
 Variable_name	Value
-Binlog_cache_use	27
+Binlog_cache_use	152
 show status like "binlog_cache_disk_use";
 Variable_name	Value
 Binlog_cache_disk_use	1
@@ -1714,90 +1690,15 @@ Variable_name	Value
 Innodb_page_size	16384
 show status like "Innodb_rows_deleted";
 Variable_name	Value
-Innodb_rows_deleted	2070
+Innodb_rows_deleted	2078
 show status like "Innodb_rows_inserted";
 Variable_name	Value
-Innodb_rows_inserted	31708
+Innodb_rows_inserted	31706
 show status like "Innodb_rows_read";
 Variable_name	Value
-Innodb_rows_read	80162
+Innodb_rows_read	80161
 show status like "Innodb_rows_updated";
 Variable_name	Value
 Innodb_rows_updated	29530
-show status like "Innodb_row_lock_waits";
-Variable_name	Value
-Innodb_row_lock_waits	0
-show status like "Innodb_row_lock_current_waits";
-Variable_name	Value
-Innodb_row_lock_current_waits	0
-show status like "Innodb_row_lock_time";
-Variable_name	Value
-Innodb_row_lock_time	0
-show status like "Innodb_row_lock_time_max";
-Variable_name	Value
-Innodb_row_lock_time_max	0
-show status like "Innodb_row_lock_time_avg";
-Variable_name	Value
-Innodb_row_lock_time_avg	0
-show variables like "innodb_sync_spin_loops";
-Variable_name	Value
-innodb_sync_spin_loops	20
-set global innodb_sync_spin_loops=1000;
-show variables like "innodb_sync_spin_loops";
-Variable_name	Value
-innodb_sync_spin_loops	1000
-set global innodb_sync_spin_loops=0;
-show variables like "innodb_sync_spin_loops";
-Variable_name	Value
-innodb_sync_spin_loops	0
-set global innodb_sync_spin_loops=20;
-show variables like "innodb_sync_spin_loops";
-Variable_name	Value
-innodb_sync_spin_loops	20
-show variables like "innodb_thread_concurrency";
-Variable_name	Value
-innodb_thread_concurrency	8
-set global innodb_thread_concurrency=1000;
-show variables like "innodb_thread_concurrency";
-Variable_name	Value
-innodb_thread_concurrency	1000
-set global innodb_thread_concurrency=0;
-show variables like "innodb_thread_concurrency";
-Variable_name	Value
-innodb_thread_concurrency	1
-set global innodb_thread_concurrency=16;
-show variables like "innodb_thread_concurrency";
-Variable_name	Value
-innodb_thread_concurrency	16
-show variables like "innodb_concurrency_tickets";
-Variable_name	Value
-innodb_concurrency_tickets	500
-set global innodb_concurrency_tickets=1000;
-show variables like "innodb_concurrency_tickets";
-Variable_name	Value
-innodb_concurrency_tickets	1000
-set global innodb_concurrency_tickets=0;
-show variables like "innodb_concurrency_tickets";
-Variable_name	Value
-innodb_concurrency_tickets	1
-set global innodb_concurrency_tickets=500;
-show variables like "innodb_concurrency_tickets";
-Variable_name	Value
-innodb_concurrency_tickets	500
-show variables like "innodb_thread_sleep_delay";
-Variable_name	Value
-innodb_thread_sleep_delay	10000
-set global innodb_thread_sleep_delay=100000;
-show variables like "innodb_thread_sleep_delay";
-Variable_name	Value
-innodb_thread_sleep_delay	100000
-set global innodb_thread_sleep_delay=0;
-show variables like "innodb_thread_sleep_delay";
-Variable_name	Value
-innodb_thread_sleep_delay	0
-set global innodb_thread_sleep_delay=10000;
-show variables like "innodb_thread_sleep_delay";
-Variable_name	Value
-innodb_thread_sleep_delay	10000
 create table t1 (v varchar(16384)) engine=innodb;
 ERROR 42000: Column length too big for column 'v' (max = 255); use BLOB instead

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	184	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);
@@ -638,15 +638,3 @@ No	Field	Count
 0	1	100
 0	2	100
 drop table t1, t2;
-CREATE TABLE t1 (
-ID           int(11) NOT NULL auto_increment,
-NO           int(11) NOT NULL default '0',
-SEQ          int(11) NOT NULL default '0',
-PRIMARY KEY  (ID),
-KEY t1$NO    (SEQ,NO)
-) ENGINE=MyISAM;
-INSERT INTO t1 (SEQ, NO) SELECT "1" AS SEQ, IF(MAX(NO) IS NULL, 0, MAX(NO)) + 1 AS NO FROM t1 WHERE (SEQ = 1);
-select SQL_BUFFER_RESULT * from t1 WHERE (SEQ = 1);
-ID	NO	SEQ
-1	1	1
-drop table t1;

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	158	Query	1	#	use `test`; insert into t1 values(1)
+master-bin.000001	239	Query	1	#	use `test`; insert into t2 select * from t1
+master-bin.000001	327	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	158	Query	1	#	use `test`; insert into t1 values(2)
+master-bin.000001	239	Query	1	#	use `test`; insert into t2 select * from t1
+master-bin.000001	327	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	158	Query	1	#	use `test`; insert into t1 values(3)
+master-bin.000001	239	Query	1	#	use `test`; savepoint my_savepoint
+master-bin.000001	318	Query	1	#	use `test`; insert into t1 values(4)
+master-bin.000001	399	Query	1	#	use `test`; insert into t2 select * from t1
+master-bin.000001	487	Query	1	#	use `test`; rollback to savepoint my_savepoint
+master-bin.000001	578	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	158	Query	1	#	use `test`; insert into t1 values(5)
+master-bin.000001	239	Query	1	#	use `test`; savepoint my_savepoint
+master-bin.000001	318	Query	1	#	use `test`; insert into t1 values(6)
+master-bin.000001	399	Query	1	#	use `test`; insert into t2 select * from t1
+master-bin.000001	487	Query	1	#	use `test`; rollback to savepoint my_savepoint
+master-bin.000001	578	Query	1	#	use `test`; insert into t1 values(7)
+master-bin.000001	659	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	158	Query	1	#	use `test`; insert into t1 values(8)
+master-bin.000001	239	Query	1	#	use `test`; insert into t2 select * from t1
+master-bin.000001	327	Query	1	#	use `test`; ROLLBACK
+master-bin.000001	392	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	158	Query	1	#	use `test`; insert into t1 values(9)
+master-bin.000001	239	Xid	1	#	COMMIT /* xid=59 */
+master-bin.000001	266	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	158	Query	1	#	use `test`; insert into t1 values(10)
+master-bin.000001	240	Xid	1	#	COMMIT /* xid=65 */
+master-bin.000001	267	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	158	Query	1	#	use `test`; insert into t1 values(10)
+master-bin.000001	240	Xid	1	#	COMMIT /* xid=65 */
+master-bin.000001	267	Query	1	#	use `test`; insert into t2 select * from t1
+master-bin.000001	355	Query	1	#	use `test`; BEGIN
+master-bin.000001	417	Query	1	#	use `test`; insert into t1 values(11)
+master-bin.000001	499	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	158	Query	1	#	use `test`; insert into t1 values(12)
+master-bin.000001	240	Query	1	#	use `test`; insert into t2 select * from t1
+master-bin.000001	328	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	158	Query	1	#	use `test`; insert into t1 values(14)
+master-bin.000001	240	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	158	Query	1	#	use `test`; insert into t1 values(16)
+master-bin.000001	240	Query	1	#	use `test`; insert into t1 values(18)
+master-bin.000001	322	Xid	1	#	COMMIT /* xid=104 */
 delete from t1;
 delete from t2;
 alter table t2 type=MyISAM;

mysql-test/r/mysqlbinlog2.result

@@ -152,6 +152,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq
 SET @@session.sql_mode=0;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
 insert into t1 values(null, "f");
+ROLLBACK;
 
 --- offset --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
@@ -181,6 +182,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq
 SET @@session.sql_mode=0;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
 insert into t1 values(null, "f");
+ROLLBACK;
 
 --- start-position --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
@@ -201,6 +203,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq
 SET @@session.sql_mode=0;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
 insert into t1 values(null, "f");
+ROLLBACK;
 
 --- stop-position --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
@@ -249,6 +252,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.uniq
 SET @@session.sql_mode=0;
 SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
 insert into t1 values(null, "f");
+ROLLBACK;
 
 --- stop-datetime --
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;

mysql-test/r/rpl000015.result

 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);

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	356	#	#	master-bin.000001	No	No							0		0	275	#	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	275	#	#	master-bin.000001	No	No							0		0	275	#	None		0	No						#
 select release_lock("a");
 release_lock("a")
 1

mysql-test/r/rpl_charset.result

@@ -4,7 +4,6 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
-set timestamp=1000000000;
 drop database if exists mysqltest2;
 drop database if exists mysqltest3;
 create database mysqltest2 character set latin2;
@@ -88,6 +87,7 @@ a	b
 2	Muffler
 3	latin1_german2_ci
 4	Müller
+load data infile '../../std_data/words.dat' into table t1 (b);
 set @a= _cp850 'Müller' collate cp850_general_ci;
 truncate table t1;
 insert into t1 (b) values(collation(@a));
@@ -103,44 +103,68 @@ 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
 master-bin.000001	#	Query	1	#	create database mysqltest2 character set latin2
+master-bin.000001	#	Query	1	#	use `test`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=8,COLLATION_DATABASE=8,COLLATION_SERVER=30
 master-bin.000001	#	Query	1	#	create database mysqltest3
+master-bin.000001	#	Query	1	#	use `test`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=8,COLLATION_DATABASE=8,COLLATION_SERVER=64
 master-bin.000001	#	Query	1	#	drop database mysqltest3
+master-bin.000001	#	Query	1	#	use `test`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=8,COLLATION_DATABASE=8,COLLATION_SERVER=64
 master-bin.000001	#	Query	1	#	create database mysqltest3
+master-bin.000001	#	Query	1	#	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=8,COLLATION_DATABASE=9,COLLATION_SERVER=64
 master-bin.000001	#	Query	1	#	use `mysqltest2`; create table t1 (a int auto_increment primary key, b varchar(100))
+master-bin.000001	#	Query	1	#	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=4,COLLATION_CONNECTION=27,COLLATION_DATABASE=9,COLLATION_SERVER=64
 master-bin.000001	#	Intvar	1	#	INSERT_ID=1
 master-bin.000001	#	Query	1	#	use `mysqltest2`; insert into t1 (b) values(@@character_set_server)
+master-bin.000001	#	Query	1	#	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=4,COLLATION_CONNECTION=27,COLLATION_DATABASE=9,COLLATION_SERVER=64
 master-bin.000001	#	Intvar	1	#	INSERT_ID=2
 master-bin.000001	#	Query	1	#	use `mysqltest2`; insert into t1 (b) values(@@collation_server)
+master-bin.000001	#	Query	1	#	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=4,COLLATION_CONNECTION=27,COLLATION_DATABASE=9,COLLATION_SERVER=64
 master-bin.000001	#	Intvar	1	#	INSERT_ID=3
 master-bin.000001	#	Query	1	#	use `mysqltest2`; insert into t1 (b) values(@@character_set_client)
+master-bin.000001	#	Query	1	#	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=4,COLLATION_CONNECTION=27,COLLATION_DATABASE=9,COLLATION_SERVER=64
 master-bin.000001	#	Intvar	1	#	INSERT_ID=4
 master-bin.000001	#	Query	1	#	use `mysqltest2`; insert into t1 (b) values(@@character_set_connection)
+master-bin.000001	#	Query	1	#	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=4,COLLATION_CONNECTION=27,COLLATION_DATABASE=9,COLLATION_SERVER=64
 master-bin.000001	#	Intvar	1	#	INSERT_ID=5
 master-bin.000001	#	Query	1	#	use `mysqltest2`; insert into t1 (b) values(@@collation_connection)
+master-bin.000001	#	Query	1	#	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=5,COLLATION_DATABASE=9,COLLATION_SERVER=64
 master-bin.000001	#	Query	1	#	use `mysqltest2`; truncate table t1
+master-bin.000001	#	Query	1	#	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=5,COLLATION_DATABASE=9,COLLATION_SERVER=64
 master-bin.000001	#	Intvar	1	#	INSERT_ID=1
 master-bin.000001	#	Query	1	#	use `mysqltest2`; insert into t1 (b) values(@@collation_connection)
+master-bin.000001	#	Query	1	#	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=5,COLLATION_DATABASE=9,COLLATION_SERVER=64
 master-bin.000001	#	Intvar	1	#	INSERT_ID=2
 master-bin.000001	#	Query	1	#	use `mysqltest2`; insert into t1 (b) values(LEAST("Müller","Muffler"))
+master-bin.000001	#	Query	1	#	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64
 master-bin.000001	#	Intvar	1	#	INSERT_ID=3
 master-bin.000001	#	Query	1	#	use `mysqltest2`; insert into t1 (b) values(@@collation_connection)
+master-bin.000001	#	Query	1	#	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64
 master-bin.000001	#	Intvar	1	#	INSERT_ID=4
 master-bin.000001	#	Query	1	#	use `mysqltest2`; insert into t1 (b) values(LEAST("Müller","Muffler"))
+master-bin.000001	#	Query	1	#	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64
+master-bin.000001	#	Intvar	1	#	INSERT_ID=74
+master-bin.000001	#	Create_file	1	#	db=mysqltest2;table=t1;file_id=1;block_len=581
+master-bin.000001	#	Query	1	#	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64
+master-bin.000001	#	Intvar	1	#	INSERT_ID=5
+master-bin.000001	#	Exec_load	1	#	;file_id=1
+master-bin.000001	#	Query	1	#	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64
 master-bin.000001	#	Query	1	#	use `mysqltest2`; truncate table t1
+master-bin.000001	#	Query	1	#	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64
 master-bin.000001	#	Intvar	1	#	INSERT_ID=1
 master-bin.000001	#	User var	1	#	@`a`=_cp850 0x4DFC6C6C6572 COLLATE cp850_general_ci
 master-bin.000001	#	Query	1	#	use `mysqltest2`; insert into t1 (b) values(collation(@a))
+master-bin.000001	#	Query	1	#	use `mysqltest2`; SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64
 master-bin.000001	#	Query	1	#	drop database mysqltest2
+master-bin.000001	#	Query	1	#	SET ONE_SHOT CHARACTER_SET_CLIENT=8,COLLATION_CONNECTION=31,COLLATION_DATABASE=9,COLLATION_SERVER=64
 master-bin.000001	#	Query	1	#	drop database mysqltest3
 set global character_set_server=latin2;
-set global character_set_server=latin1;
+ERROR HY000: Binary logging and replication forbid changing the global server character set, collation
 set global character_set_server=latin2;
-set global character_set_server=latin1;
+ERROR HY000: Binary logging and replication forbid changing the global server character set, collation
 set one_shot @@character_set_server=latin5;
 set @@max_join_size=1000;
 select @@character_set_server;
@@ -174,74 +198,12 @@ CDF32C20E7E020F0FBE1E0EBEAF3	CDF32C20E7E020F0FBE1E0EBEAF3
 select hex(c1), hex(c2) from t1;
 hex(c1)	hex(c2)
 CDF32C20E7E020F0FBE1E0EBEAF3	CDF32C20E7E020F0FBE1E0EBEAF3
-/*!40019 SET @@session.max_insert_delayed_threads=0*/;
-SET TIMESTAMP=1000000000;
-SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
-SET @@session.sql_mode=0;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
-drop database if exists mysqltest2;
-SET TIMESTAMP=1000000000;
-drop database if exists mysqltest3;
-SET TIMESTAMP=1000000000;
-create database mysqltest2 character set latin2;
-SET TIMESTAMP=1000000000;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=30;
-create database mysqltest3;
-SET TIMESTAMP=1000000000;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=64;
-drop database mysqltest3;
-SET TIMESTAMP=1000000000;
-create database mysqltest3;
-use mysqltest2;
-SET TIMESTAMP=1000000000;
-create table t1 (a int auto_increment primary key, b varchar(100));
-SET INSERT_ID=1;
-SET TIMESTAMP=1000000000;
-SET @@session.character_set_client=4,@@session.collation_connection=27,@@session.collation_server=64;
-insert into t1 (b) values(@@character_set_server);
-SET INSERT_ID=2;
-SET TIMESTAMP=1000000000;
-insert into t1 (b) values(@@collation_server);
-SET INSERT_ID=3;
-SET TIMESTAMP=1000000000;
-insert into t1 (b) values(@@character_set_client);
-SET INSERT_ID=4;
-SET TIMESTAMP=1000000000;
-insert into t1 (b) values(@@character_set_connection);
-SET INSERT_ID=5;
-SET TIMESTAMP=1000000000;
-insert into t1 (b) values(@@collation_connection);
-SET TIMESTAMP=1000000000;
-SET @@session.character_set_client=8,@@session.collation_connection=5,@@session.collation_server=64;
-truncate table t1;
-SET INSERT_ID=1;
-SET TIMESTAMP=1000000000;
-insert into t1 (b) values(@@collation_connection);
-SET INSERT_ID=2;
-SET TIMESTAMP=1000000000;
-insert into t1 (b) values(LEAST("Mller","Muffler"));
-SET INSERT_ID=3;
-SET TIMESTAMP=1000000000;
-SET @@session.character_set_client=8,@@session.collation_connection=31,@@session.collation_server=64;
-insert into t1 (b) values(@@collation_connection);
-SET INSERT_ID=4;
-SET TIMESTAMP=1000000000;
-insert into t1 (b) values(LEAST("Mller","Muffler"));
-SET TIMESTAMP=1000000000;
-truncate table t1;
-SET INSERT_ID=1;
-SET @`a`:=_cp850 0x4DFC6C6C6572 COLLATE `cp850_general_ci`;
-SET TIMESTAMP=1000000000;
-insert into t1 (b) values(collation(@a));
-SET TIMESTAMP=1000000000;
-drop database mysqltest2;
-SET TIMESTAMP=1000000000;
-drop database mysqltest3;
-use test;
-SET TIMESTAMP=1000000000;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=30;
-CREATE TABLE t1 (c1 VARBINARY(255), c2 VARBINARY(255));
-SET TIMESTAMP=1000000000;
-SET @@session.character_set_client=7,@@session.collation_connection=51,@@session.collation_server=30;
-INSERT INTO t1 (c1, c2) VALUES (',  ',',  ');
+stop slave;
+delete from t1;
+change master to master_log_pos=6810;
+start slave until master_log_file='master-bin.000001', master_log_pos=6968;
+start slave;
+select hex(c1), hex(c2) from t1;
+hex(c1)	hex(c2)
+CDF32C20E7E020F0FBE1E0EBEAF3	CDF32C20E7E020F0FBE1E0EBEAF3
 drop table t1;

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	274	#	#	master-bin.000001	Yes	Yes				test.t3,test.t1,test.t2			0		0	274	#	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	188	use `test`; create table t1 (a int primary key)
+master-bin.000001	188	Query	1	274	use `test`; insert into t1 values (1),(1)
+master-bin.000001	274	Query	1	344	use `test`; drop table t1
+master-bin.000001	344	Query	1	436	use `test`; create table t2 (a int primary key)
+master-bin.000001	436	Query	1	517	use `test`; insert into t2 values(1)
+master-bin.000001	517	Query	1	598	use `test`; create table t3 (id int)
+master-bin.000001	598	Query	1	693	use `test`; insert into t3 values(connection_id())
+master-bin.000001	693	Query	1	806	use `test`; update t2 set a = a + 1 + get_lock('crash_lock%20C', 10)
+master-bin.000001	806	Query	1	879	use `test`; drop table t2,t3

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	200	#	#	slave-bin.000001	Yes	Yes							0		0	200	#	None		0	No						#

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	176	use `test`; create table t1 (a int)
+master-bin.000001	176	Query	1	259	use `test`; insert into t1 values (10)
+master-bin.000001	259	Query	1	339	use `test`; create table t2 (a int)
+master-bin.000001	339	Query	1	442	use `test`; create table t3 (a int) engine=merge union(t1)
+master-bin.000001	442	Query	1	522	use `test`; create table t4 (a int)
+master-bin.000001	522	Query	1	610	use `test`; insert into t4 select * from t3
+master-bin.000001	610	Query	1	698	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	176	use `test`; create table t1 (a int)
+master-bin.000001	176	Query	1	259	use `test`; insert into t1 values (10)
+master-bin.000001	259	Query	1	339	use `test`; create table t2 (a int)
+master-bin.000001	339	Query	1	442	use `test`; create table t3 (a int) engine=merge union(t1)
+master-bin.000001	442	Query	1	522	use `test`; create table t4 (a int)
+master-bin.000001	522	Query	1	610	use `test`; insert into t4 select * from t3
+master-bin.000001	610	Query	1	698	use `test`; rename table t1 to t5, t2 to t1
+master-bin.000001	698	Query	1	767	use `test`; flush tables
 select * from t3;
 a

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	1069		
 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	1504	#	#	master-bin.000001	Yes	Yes							0		0	1504	#	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	1612	#	#	master-bin.000001	No	No							0		0	1612	#	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	530		
 drop table t2;

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	191	drop database if exists mysqltest
+master-bin.000001	191	Query	1	278	create database mysqltest
 drop database mysqltest;

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

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	211	use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001	211	Intvar	1	239	INSERT_ID=1
+master-bin.000001	239	Query	1	324	use `test`; insert into t1 values (NULL)
+master-bin.000001	324	Query	1	394	use `test`; drop table t1
+master-bin.000001	394	Query	1	491	use `test`; create table t1 (word char(20) not null)
+master-bin.000001	491	Create_file	1	1161	db=test;table=t1;file_id=1;block_len=581
+master-bin.000001	1161	Exec_load	1	1184	;file_id=1
+master-bin.000001	1184	Query	1	1254	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	211	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	211	use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001	211	Intvar	1	239	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	239	Query	1	324	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	211	use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001	211	Intvar	1	239	INSERT_ID=1
+master-bin.000001	239	Query	1	324	use `test`; insert into t1 values (NULL)
+master-bin.000001	324	Query	1	394	use `test`; drop table t1
+master-bin.000001	394	Query	1	491	use `test`; create table t1 (word char(20) not null)
+master-bin.000001	491	Create_file	1	1161	db=test;table=t1;file_id=1;block_len=581
+master-bin.000001	1161	Exec_load	1	1184	;file_id=1
+master-bin.000001	1184	Query	1	1254	use `test`; drop table t1
+master-bin.000001	1254	Rotate	1	1298	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	176	use `test`; create table t5 (a int)
+master-bin.000002	176	Query	1	246	use `test`; drop table t5
+master-bin.000002	246	Query	1	326	use `test`; create table t1 (n int)
+master-bin.000002	326	Query	1	408	use `test`; insert into t1 values (1)
+master-bin.000002	408	Query	1	478	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	211	use `test`; create table t1(n int not null auto_increment primary key)
+slave-bin.000001	211	Intvar	1	239	INSERT_ID=1
+slave-bin.000001	239	Query	1	324	use `test`; insert into t1 values (NULL)
+slave-bin.000001	324	Query	1	394	use `test`; drop table t1
+slave-bin.000001	394	Query	1	491	use `test`; create table t1 (word char(20) not null)
+slave-bin.000001	491	Create_file	1	1170	db=test;table=t1;file_id=1;block_len=581
+slave-bin.000001	1170	Exec_load	1	1193	;file_id=1
+slave-bin.000001	1193	Query	1	1263	use `test`; drop table t1
+slave-bin.000001	1263	Query	1	1343	use `test`; create table t5 (a int)
+slave-bin.000001	1343	Query	1	1413	use `test`; drop table t5
+slave-bin.000001	1413	Rotate	2	1456	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	176	use `test`; create table t1 (n int)
+slave-bin.000002	176	Query	1	258	use `test`; insert into t1 values (1)
+slave-bin.000002	258	Query	1	328	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	478	#	#	master-bin.000002	Yes	Yes							0		0	478	#	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

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

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	68138	#	#	master-bin.000001	Yes	Yes							0		0	68138	#	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	68138	#	#	master-bin.000001	Yes	Yes							0		0	68138	#	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	68138	#	#	master-bin.000001	Yes	Yes							0		0	68138	#	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	68218	#	#	master-bin.000001	Yes	Yes							0		0	68218	#	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	68288	#	#	master-bin.000001	Yes	Yes							0		0	68288	#	None		0	No						#
 flush logs;
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000002	95		
+master-bin.000002	96		

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	687172	#	#	master-bin.000001	Yes	Yes							0		0	687172	#	None		0	No						#
 drop table t1;

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	1555	#	#	master-bin.000001	Yes	Yes			test.t1				0		0	1555	#	None		0	No						#

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;

mysql-test/r/rpl_rotate_logs.result

 drop table if exists t1, t2, t3, t4;
 drop table if exists t1, t2, t3, t4;
 start slave;
-Got one of the listed errors
+ERROR HY000: File 'TESTDIR/var/slave-data/master.info' not found (Errcode: 13)
 start slave;
 ERROR HY000: Could not initialize master info structure; more error messages can be found in the MySQL error log
 change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root';
@@ -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	522	#	#	master-bin.000001	Yes	Yes							0		0	522	#	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	470	#	#	master-bin.000003	Yes	Yes							0		0	470	#	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	1388		
 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	1388	#	#	master-bin.000005	Yes	Yes							0		0	1388	#	None		0	No						#
 lock tables t3 read;
 select count(*) from t3 where n >= 4;
 count(*)

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";

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;

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	179	use `test`; drop table if exists t1,t2
+master-bin.000001	179	Query	1	258	use `test`; create table t1(f int)
+master-bin.000001	258	Query	1	337	use `test`; create table t2(f int)
+master-bin.000001	337	Query	1	456	use `test`; insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10)
+master-bin.000001	456	Query	1	545	use `test`; create temporary table t3(f int)
+master-bin.000001	545	Query	1	643	use `test`; insert into t3 select * from t1 where f<6
+master-bin.000001	643	Query	1	732	use `test`; create temporary table t3(f int)
+master-bin.000001	732	Query	1	827	use `test`; insert into t2 select count(*) from t3
+master-bin.000001	827	Query	1	926	use `test`; insert into t3 select * from t1 where f>=4
+master-bin.000001	926	Query	1	1006	use `test`; drop temporary table t3
+master-bin.000001	1006	Query	1	1101	use `test`; insert into t2 select count(*) from t3
+master-bin.000001	1101	Query	1	1181	use `test`; drop temporary table t3
 drop table t1, t2;
 use test;
 SET TIMESTAMP=1040323920;

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	182	use `test`; create table t1 (t timestamp)
+master-bin.000001	182	Query	1	267	use `test`; create table t2 (t char(32))
+master-bin.000001	267	Query	1	352	use `test`; SET ONE_SHOT TIME_ZONE='UTC'
+master-bin.000001	352	Query	1	469	use `test`; insert into t1 values ('20040101000000'), ('20040611093902')
+master-bin.000001	469	Query	1	540	use `test`; delete from t1
+master-bin.000001	540	Query	1	657	use `test`; insert into t1 values ('20040101000000'), ('20040611093902')
 set time_zone='MET';
 insert into t2 (select t from t1);
 select * from t1;

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	211	use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001	211	Query	1	305	use `test`; insert into t1 values (1),(2),(3),(4)
+master-bin.000001	305	Query	1	375	use `test`; drop table t1
+master-bin.000001	375	Query	1	490	use `test`; create table t2(n int not null auto_increment primary key)
+master-bin.000001	490	Query	1	576	use `test`; insert into t2 values (1),(2)
+master-bin.000001	576	Query	1	662	use `test`; insert into t2 values (3),(4)
+master-bin.000001	662	Query	1	732	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	732	slave-relay-bin.000004	#	master-bin.000001	Yes	No							0		0	305	#	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	732	slave-relay-bin.000004	#	master-bin.000001	Yes	No							0		0	305	#	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	732	slave-relay-bin.000004	#	master-bin.000001	Yes	No							0		0	576	#	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	732	slave-relay-bin.000004	#	master-bin.000001	Yes	No							0		0	732	#	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;

mysql-test/r/rpl_user_variables.result

@@ -76,35 +76,34 @@ abcn1n2
 NULL
 NULL
 NULL
-show binlog events from 95;
+show binlog events from 180;
 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	180	User var	2	223	@`i1`=12345678901234
+slave-bin.000001	223	User var	2	266	@`i2`=-12345678901234
+slave-bin.000001	266	User var	2	309	@`i3`=0
+slave-bin.000001	309	User var	2	352	@`i4`=-1
+slave-bin.000001	352	Query	1	457	use `test`; insert into t1 values (@i1), (@i2), (@i3), (@i4)
+slave-bin.000001	457	User var	2	500	@`r1`=12.5
+slave-bin.000001	500	User var	2	543	@`r2`=-12.5
+slave-bin.000001	543	Query	1	634	use `test`; insert into t1 values (@r1), (@r2)
+slave-bin.000001	634	User var	2	683	@`s1`=_latin1 0x5468697320697320612074657374 COLLATE latin1_swedish_ci
+slave-bin.000001	683	User var	2	718	@`s2`=_latin1 "" COLLATE latin1_swedish_ci
+slave-bin.000001	718	User var	2	760	@`s3`=_latin1 0x61626327646566 COLLATE latin1_swedish_ci
+slave-bin.000001	760	User var	2	802	@`s4`=_latin1 0x6162635C646566 COLLATE latin1_swedish_ci
+slave-bin.000001	802	User var	2	844	@`s5`=_latin1 0x61626327646566 COLLATE latin1_swedish_ci
+slave-bin.000001	844	Query	1	956	use `test`; insert into t1 values (@s1), (@s2), (@s3), (@s4), (@s5)
+slave-bin.000001	956	User var	2	982	@`n1`=NULL
+slave-bin.000001	982	Query	1	1066	use `test`; insert into t1 values (@n1)
+slave-bin.000001	1066	User var	2	1092	@`n2`=NULL
+slave-bin.000001	1092	Query	1	1176	use `test`; insert into t1 values (@n2)
+slave-bin.000001	1176	Query	1	1286	use `test`; insert into t1 values (@a:=0), (@a:=@a+1), (@a:=@a+1)
+slave-bin.000001	1286	User var	2	1328	@`a`=2
+slave-bin.000001	1328	Query	1	1422	use `test`; insert into t1 values (@a+(@b:=@a+1))
+slave-bin.000001	1422	User var	2	1459	@`q`=_latin1 0x616263 COLLATE latin1_swedish_ci
+slave-bin.000001	1459	Query	1	1585	use `test`; insert t1 values (@q), (@q:=concat(@q, 'n1')), (@q:=concat(@q, 'n2'))
+slave-bin.000001	1585	User var	2	1627	@`a`=5
+slave-bin.000001	1627	Query	1	1715	use `test`; insert into t1 values (@a),(@a)
+slave-bin.000001	1715	User var	2	1740	@`a`=NULL
+slave-bin.000001	1740	Query	1	1835	use `test`; insert into t1 values (@a),(@a),(@a*5)
 drop table t1;
 stop slave;

mysql-test/r/user_var.result

@@ -172,27 +172,24 @@ SET TIMESTAMP=10000;
 SET @`a b`='hello';
 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;
+insert into t1 values (@var1);
+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	223	use `test`; INSERT INTO t1 VALUES(@`a b`)
+master-bin.000001	223	User var	1	265	@`var1`=_latin1 0x273B616161 COLLATE latin1_swedish_ci
+master-bin.000001	265	Query	1	351	use `test`; insert into t1 values (@var1)
+flush logs;
 /*!40019 SET @@session.max_insert_delayed_threads=0*/;
-SET @`a b`:=_latin1 0x68656C6C6F COLLATE `latin1_swedish_ci`;
+SET @`a b`:=_latin1 0x68656C6C6F COLLATE latin1_swedish_ci;
 use test;
 SET TIMESTAMP=10000;
 SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1;
 SET @@session.sql_mode=0;
-SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8;
 INSERT INTO t1 VALUES(@`a b`);
-SET @`var1`:=_latin1 0x273B616161 COLLATE `latin1_swedish_ci`;
-SET @`var2`:=_latin1 0x61 COLLATE `latin1_swedish_ci`;
+SET @`var1`:=_latin1 0x273B616161 COLLATE latin1_swedish_ci;
 SET TIMESTAMP=10000;
-insert into t1 values (@var1),(@var2);
+insert into t1 values (@var1);
 drop table t1;
 set @var= NULL ;
 select FIELD( @var,'1it','Hit') as my_column;

mysql-test/t/ctype_ucs.test

@@ -338,7 +338,8 @@ 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;
+flush logs;
 # more important than SHOW BINLOG EVENTS, mysqlbinlog (where we
 # absolutely need variables names to be quoted and strings to be
 # escaped).

mysql-test/t/mix_innodb_myisam_binlog.test

@@ -26,7 +26,7 @@ insert into t2 select * from t1;
 commit;
 
 --replace_column 5 #
-show binlog events from 95;
+show binlog events from 96;
 
 delete from t1;
 delete from t2;
@@ -39,7 +39,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 +54,7 @@ rollback to savepoint my_savepoint;
 commit;
 
 --replace_column 5 #
-show binlog events from 95;
+show binlog events from 96;
 
 delete from t1;
 delete from t2;
@@ -71,7 +71,7 @@ commit;
 select a from t1 order by a; # check that savepoints work :)
 
 --replace_column 5 #
-show binlog events from 95;
+show binlog events from 96;
 
 # and when ROLLBACK is not explicit?
 delete from t1;
@@ -92,7 +92,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 +103,7 @@ insert into t1 values(9);
 insert into t2 select * from t1;
 
 --replace_column 5 #
-show binlog events from 95;
+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 +115,12 @@ 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;
+show binlog events from 96;
 insert into t1 values(11);
 commit;
 
 --replace_column 5 #
-show binlog events from 95;
+show binlog events from 96;
 
 
 # Check that things work like before this BEGIN/ROLLBACK code was added,
@@ -138,7 +138,7 @@ insert into t2 select * from t1;
 commit;
 
 --replace_column 5 #
-show binlog events from 95;
+show binlog events from 96;
 
 delete from t1;
 delete from t2;
@@ -150,7 +150,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 +165,7 @@ rollback to savepoint my_savepoint;
 commit;
 
 --replace_column 5 #
-show binlog events from 95;
+show binlog events from 96;
 
 delete from t1;
 delete from t2;
@@ -182,7 +182,7 @@ commit;
 select a from t1 order by a; # check that savepoints work :)
 
 --replace_column 5 #
-show binlog events from 95;
+show binlog events from 96;
 
 # Test for BUG#5714, where a MyISAM update in the transaction used to
 # release row-level locks in InnoDB

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;
+

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

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;
+

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

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;

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

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.

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;

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;

mysql-test/t/user_var.test

@@ -110,7 +110,8 @@ 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;
+flush logs;
 # more important than SHOW BINLOG EVENTS, mysqlbinlog (where we
 # absolutely need variables names to be quoted and strings to be
 # escaped).

mysys/hash.c

@@ -103,7 +103,7 @@ static inline void hash_free_elements(HASH *hash)
     hash_free()
     hash   the hash to delete elements of
 
-  NOTES: Hash can't be reused wuthing calling hash_init again.
+  NOTES: Hash can't be reused without calling hash_init again.
 */
 
 void hash_free(HASH *hash)

sql/ha_berkeley.cc

@@ -102,11 +102,34 @@ static int write_status(DB *status_block, char *buff, uint length);
 static void update_status(BDB_SHARE *share, TABLE *table);
 static void berkeley_noticecall(DB_ENV *db_env, db_notices notice);
 
-
+static int berkeley_close_connection(THD *thd);
+static int berkeley_commit(THD *thd, bool all);
+static int berkeley_rollback(THD *thd, bool all);
+
+static handlerton berkeley_hton = {
+  0, /* slot */
+  0, /* savepoint size */
+  berkeley_close_connection,
+  NULL, /* savepoint_set */
+  NULL, /* savepoint_rollback */
+  NULL, /* savepoint_release */
+  berkeley_commit,
+  berkeley_rollback,
+  NULL, /* prepare */
+  NULL, /* recover */
+  NULL, /* commit_by_xid */
+  NULL /* rollback_by_xid */
+};
+
+typedef struct st_berkeley_trx_data {
+  DB_TXN *all;
+  DB_TXN *stmt;
+  uint bdb_lock_count;
+} berkeley_trx_data;
 
 /* General functions */
 
-bool berkeley_init(void)
+handlerton *berkeley_init(void)
 {
   DBUG_ENTER("berkeley_init");
 
@@ -135,7 +158,7 @@ bool berkeley_init(void)
   berkeley_log_file_size= max(berkeley_log_file_size, 10*1024*1024L);
 
   if (db_env_create(&db_env,0))
-    DBUG_RETURN(1); /* purecov: inspected */
+    DBUG_RETURN(0);
   db_env->set_errcall(db_env,berkeley_print_error);
   db_env->set_errpfx(db_env,"bdb");
   db_env->set_noticecall(db_env, berkeley_noticecall);
@@ -163,16 +186,15 @@ bool berkeley_init(void)
 		   DB_INIT_LOG | DB_INIT_MPOOL | DB_INIT_TXN |
 		   DB_CREATE | DB_THREAD, 0666))
   {
-    db_env->close(db_env,0); /* purecov: inspected */
-    db_env=0; /* purecov: inspected */
-    goto err;
+    db_env->close(db_env,0);
+    db_env=0;
+    DBUG_RETURN(0);
   }
 
   (void) hash_init(&bdb_open_tables,system_charset_info,32,0,0,
 		   (hash_get_key) bdb_get_key,0,0);
   pthread_mutex_init(&bdb_mutex,MY_MUTEX_INIT_FAST);
-err:
-  DBUG_RETURN(db_env == 0);
+  DBUG_RETURN(&berkeley_hton);
 }
 
 
@@ -190,6 +212,11 @@ bool berkeley_end(void)
   DBUG_RETURN(error != 0);
 }
 
+static int berkeley_close_connection(THD *thd)
+{
+  my_free((gptr)thd->ha_data[berkeley_hton.slot], MYF(0));
+}
+
 bool berkeley_flush_logs()
 {
   int error;
@@ -208,26 +235,29 @@ bool berkeley_flush_logs()
   DBUG_RETURN(result);
 }
 
-
-int berkeley_commit(THD *thd, void *trans)
+static int berkeley_commit(THD *thd, bool all)
 {
   DBUG_ENTER("berkeley_commit");
-  DBUG_PRINT("trans",("ending transaction %s",
-		      trans == thd->transaction.stmt.bdb_tid ? "stmt" : "all"));
-  int error=txn_commit((DB_TXN*) trans,0);
+  DBUG_PRINT("trans",("ending transaction %s", all ? "all" : "stmt"));
+  berkeley_trx_data *trx=(berkeley_trx_data *)thd->ha_data[berkeley_hton.slot];
+  DB_TXN **txn= all ? &trx->all : &trx->stmt;
+  int error=txn_commit(*txn,0);
+  *txn=0;
 #ifndef DBUG_OFF
   if (error)
-    DBUG_PRINT("error",("error: %d",error)); /* purecov: inspected */
+    DBUG_PRINT("error",("error: %d",error));
 #endif
   DBUG_RETURN(error);
 }
 
-int berkeley_rollback(THD *thd, void *trans)
+static int berkeley_rollback(THD *thd, bool all)
 {
   DBUG_ENTER("berkeley_rollback");
-  DBUG_PRINT("trans",("aborting transaction %s",
-		      trans == thd->transaction.stmt.bdb_tid ? "stmt" : "all"));
-  int error=txn_abort((DB_TXN*) trans);
+  DBUG_PRINT("trans",("aborting transaction %s", all ? "all" : "stmt"));
+  berkeley_trx_data *trx=(berkeley_trx_data *)thd->ha_data[berkeley_hton.slot];
+  DB_TXN **txn= all ? &trx->all : &trx->stmt;
+  int error=txn_abort(*txn);
+  *txn=0;
   DBUG_RETURN(error);
 }
 
@@ -1842,62 +1872,65 @@ int ha_berkeley::reset(void)
 int ha_berkeley::external_lock(THD *thd, int lock_type)
 {
   int error=0;
+  berkeley_trx_data *trx=(berkeley_trx_data *)thd->ha_data[berkeley_hton.slot];
   DBUG_ENTER("ha_berkeley::external_lock");
+  if (!trx)
+  {
+    thd->ha_data[berkeley_hton.slot]= trx= (berkeley_trx_data *)
+      my_malloc(sizeof(*trx), MYF(MY_ZEROFILL));
+    if (!trx)
+      DBUG_RETURN(1);
+  }
   if (lock_type != F_UNLCK)
   {
-    if (!thd->transaction.bdb_lock_count++)
+    if (!trx->bdb_lock_count++)
     {
-      DBUG_ASSERT(thd->transaction.stmt.bdb_tid == 0);
+      DBUG_ASSERT(trx->stmt == 0);
       transaction=0;				// Safety
       /* First table lock, start transaction */
       if ((thd->options & (OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN |
-			   OPTION_TABLE_LOCK)) &&
-	  !thd->transaction.all.bdb_tid)
+                           OPTION_TABLE_LOCK)) && !trx->all)
       {
 	/* We have to start a master transaction */
 	DBUG_PRINT("trans",("starting transaction all:  options: 0x%lx",
                             (ulong) thd->options));
-	if ((error=txn_begin(db_env, 0,
-			     (DB_TXN**) &thd->transaction.all.bdb_tid,
-			     0)))
+        if ((error=txn_begin(db_env, 0, &trx->all, 0)))
 	{
-	  thd->transaction.bdb_lock_count--;	// We didn't get the lock /* purecov: inspected */
-	  DBUG_RETURN(error); /* purecov: inspected */
+          trx->bdb_lock_count--;        // We didn't get the lock
+          DBUG_RETURN(error);
 	}
+        trans_register_ha(thd, TRUE, &berkeley_hton);
 	if (thd->in_lock_tables)
 	  DBUG_RETURN(0);			// Don't create stmt trans
       }
       DBUG_PRINT("trans",("starting transaction stmt"));
-      if ((error=txn_begin(db_env,
-			   (DB_TXN*) thd->transaction.all.bdb_tid,
-			   (DB_TXN**) &thd->transaction.stmt.bdb_tid,
-			   0)))
+      if ((error=txn_begin(db_env, trx->all, &trx->stmt, 0)))
       {
 	/* We leave the possible master transaction open */
-	thd->transaction.bdb_lock_count--;	// We didn't get the lock /* purecov: inspected */
-	DBUG_RETURN(error); /* purecov: inspected */
+        trx->bdb_lock_count--;                  // We didn't get the lock
+        DBUG_RETURN(error);
       }
+      trans_register_ha(thd, FALSE, &berkeley_hton);
     }
-    transaction= (DB_TXN*) thd->transaction.stmt.bdb_tid;
+    transaction= trx->stmt;
   }
   else
   {
     lock.type=TL_UNLOCK;			// Unlocked
     thread_safe_add(share->rows, changed_rows, &share->mutex);
     changed_rows=0;
-    if (!--thd->transaction.bdb_lock_count)
+    if (!--trx->bdb_lock_count)
     {
-      if (thd->transaction.stmt.bdb_tid)
+      if (trx->stmt)
       {
 	/*
-	   F_UNLOCK is done without a transaction commit / rollback.
+	   F_UNLCK is done without a transaction commit / rollback.
 	   This happens if the thread didn't update any rows
 	   We must in this case commit the work to keep the row locks
 	*/
 	DBUG_PRINT("trans",("commiting non-updating transaction"));
-	error=txn_commit((DB_TXN*) thd->transaction.stmt.bdb_tid,0);
-	thd->transaction.stmt.bdb_tid=0;
-	transaction=0;
+        error= txn_commit(trx->stmt,0);
+        trx->stmt= transaction= 0;
       }
     }
   }
@@ -1915,14 +1948,20 @@ int ha_berkeley::start_stmt(THD *thd)
 {
   int error=0;
   DBUG_ENTER("ha_berkeley::start_stmt");
-  if (!thd->transaction.stmt.bdb_tid)
+  berkeley_trx_data *trx=(berkeley_trx_data *)thd->ha_data[berkeley_hton.slot];
+  DBUG_ASSERT(trx);
+  /*
+    note that trx->stmt may have been already initialized as start_stmt()
+    is called for *each table* not for each storage engine,
+    and there could be many bdb tables referenced in the query
+  */
+  if (!trx->stmt)
   {
     DBUG_PRINT("trans",("starting transaction stmt"));
-    error=txn_begin(db_env, (DB_TXN*) thd->transaction.all.bdb_tid,
-		    (DB_TXN**) &thd->transaction.stmt.bdb_tid,
-		    0);
+    error=txn_begin(db_env, trx->all, &trx->stmt, 0);
+    trans_register_ha(thd, FALSE, &berkeley_hton);
   }
-  transaction= (DB_TXN*) thd->transaction.stmt.bdb_tid;
+  transaction= trx->stmt;
   DBUG_RETURN(error);
 }
 
@@ -2258,6 +2297,8 @@ int ha_berkeley::analyze(THD* thd, HA_CHECK_OPT* check_opt)
   uint i;
   DB_BTREE_STAT *stat=0;
   DB_TXN_STAT *txn_stat_ptr= 0;
+  berkeley_trx_data *trx=(berkeley_trx_data *)thd->ha_data[berkeley_hton.slot];
+  DBUG_ASSERT(trx);
 
   /*
    Original bdb documentation says:
@@ -2273,11 +2314,8 @@ int ha_berkeley::analyze(THD* thd, HA_CHECK_OPT* check_opt)
   {
     DB_TXN_ACTIVE *atxn_stmt= 0, *atxn_all= 0;
 
-    DB_TXN *txn_all= (DB_TXN*) thd->transaction.all.bdb_tid;
-    u_int32_t all_id= txn_all->id(txn_all);
-    
-    DB_TXN *txn_stmt= (DB_TXN*) thd->transaction.stmt.bdb_tid;
-    u_int32_t stmt_id= txn_stmt->id(txn_stmt);
+    u_int32_t all_id= trx->all->id(trx->all);
+    u_int32_t stmt_id= trx->stmt->id(trx->stmt);
 
     DB_TXN_ACTIVE *cur= txn_stat_ptr->st_txnarray;
     DB_TXN_ACTIVE *end= cur + txn_stat_ptr->st_nactive;

sql/ha_berkeley.h

@@ -168,9 +168,7 @@ extern char *berkeley_home, *berkeley_tmpdir, *berkeley_logdir;
 extern long berkeley_lock_scan_time;
 extern TYPELIB berkeley_lock_typelib;
 
-bool berkeley_init(void);
+handlerton *berkeley_init(void);
 bool berkeley_end(void);
 bool berkeley_flush_logs(void);
-int berkeley_commit(THD *thd, void *trans);
-int berkeley_rollback(THD *thd, void *trans);
 int berkeley_show_logs(Protocol *protocol);

sql/ha_innodb.h

@@ -245,38 +245,31 @@ extern ulong srv_thread_concurrency;
 
 extern TYPELIB innobase_lock_typelib;
 
-bool innobase_init(void);
+handlerton *innobase_init(void);
 bool innobase_end(void);
 bool innobase_flush_logs(void);
 uint innobase_get_free_space(void);
 
-int innobase_commit(THD *thd, void* trx_handle);
+/*
+  don't delete it - it may be re-enabled later
+  as an optimization for the most common case InnoDB+binlog
+*/
+#if 0
 int innobase_report_binlog_offset_and_commit(
         THD*    thd,
 	void*	trx_handle,
         char*   log_file_name,
         my_off_t end_offset);
-int innobase_commit_complete(
-        void*   trx_handle);
-int innobase_rollback(THD *thd, void* trx_handle);
-int innobase_rollback_to_savepoint(
-	THD*	thd,
-	char*	savepoint_name,
-	my_off_t* binlog_cache_pos);
-int innobase_savepoint(
-	THD*	thd,
-	char*	savepoint_name,
-	my_off_t binlog_cache_pos);
-int innobase_release_savepoint_name(
-	THD*	thd,
-	char*	savepoint_name);
-int innobase_close_connection(THD *thd);
+int innobase_commit_complete(void* trx_handle);
+void innobase_store_binlog_offset_and_flush_log(char *binlog_name,longlong offset);
+#endif
+
 int innobase_drop_database(char *path);
 bool innodb_show_status(THD* thd);
 bool innodb_mutex_show_status(THD* thd);
 void innodb_export_status(void);
 
-void innobase_release_temporary_latches(void* innobase_tid);
+void innobase_release_temporary_latches(THD *thd);
 
 void innobase_store_binlog_offset_and_flush_log(char *binlog_name,longlong offset);
 

sql/handler.h

@@ -93,6 +93,11 @@
 #define HA_KEY_SWITCH_NONUNIQ_SAVE 2
 #define HA_KEY_SWITCH_ALL_SAVE     3
 
+/*
+  Note: the following includes binlog and closing 0.
+  so: innodb+bdb+ndb+binlog+0
+*/
+#define MAX_HA 5
 
 /*
   Bits in index_ddl_flags(KEY *wanted_index)
@@ -192,16 +197,12 @@ enum row_type { ROW_TYPE_NOT_USED=-1, ROW_TYPE_DEFAULT, ROW_TYPE_FIXED,
 #define HA_CREATE_USED_COMMENT          (1L << 16)
 #define HA_CREATE_USED_PASSWORD         (1L << 17)
 
-typedef struct st_thd_trans {
-  void *bdb_tid;
-  void *innobase_tid;
-  bool innodb_active_trans;
-  void *ndb_tid;
-} THD_TRANS;
+typedef ulonglong my_xid;
+#define MYSQL_XID_PREFIX "MySQLXid"
+#define MYSQL_XID_PREFIX_LEN 8 // must be a multiple of 8
+#define MYSQL_XID_OFFSET (MYSQL_XID_PREFIX_LEN+sizeof(server_id))
+#define MYSQL_XID_GTRID_LEN (MYSQL_XID_OFFSET+sizeof(my_xid))
 
-#ifndef XIDDATASIZE  /* no xa.h included */
-
-/* XXX - may be we should disable xa completely in this case ? */
 #define XIDDATASIZE 128
 #define MAXGTRIDSIZE 64
 #define MAXBQUALSIZE 64
@@ -210,22 +211,106 @@ struct xid_t {
   long formatID;
   long gtrid_length;
   long bqual_length;
-  char data[XIDDATASIZE];
-};
+  char data[XIDDATASIZE];  // not \0-terminated !
 
+  bool eq(LEX_STRING *l) { return eq(l->length, 0, l->str); }
+  bool eq(long g, long b, const char *d)
+  { return g == gtrid_length && b == bqual_length && !memcmp(d, data, g+b); }
+  void set(LEX_STRING *l) { set(l->length, 0, l->str); }
+  void set(ulonglong l)
+  {
+    set(MYSQL_XID_PREFIX_LEN, 0, MYSQL_XID_PREFIX);
+    *(ulong*)(data+MYSQL_XID_PREFIX_LEN)=server_id;
+    *(my_xid*)(data+MYSQL_XID_OFFSET)=l;
+    gtrid_length=MYSQL_XID_GTRID_LEN;
+  }
+  void set(long g, long b, const char *d)
+  {
+    formatID=1;
+    gtrid_length= g;
+    bqual_length= b;
+    memcpy(data, d, g+b);
+  }
+  bool is_null() { return formatID == -1; }
+  void null() { formatID= -1; }
+  my_xid quick_get_my_xid()
+  {
+    return *(my_xid*)(data+MYSQL_XID_OFFSET);
+  }
+  my_xid get_my_xid()
+  {
+    return gtrid_length == MYSQL_XID_GTRID_LEN && bqual_length == 0 &&
+           *(ulong*)(data+MYSQL_XID_PREFIX_LEN) == server_id &&
+           !memcmp(data, MYSQL_XID_PREFIX, MYSQL_XID_PREFIX_LEN) ?
+           quick_get_my_xid() : 0;
+  }
+};
 typedef struct xid_t XID;
 
+/* for recover() handlerton call */
+#define MIN_XID_LIST_SIZE  128
+#define MAX_XID_LIST_SIZE  (1024*128)
 
-#endif
+/*
+  handlerton is a singleton structure - one instance per storage engine -
+  to provide access to storage engine functionality that works on
+  "global" level (unlike handler class that works on per-table basis)
+
+  usually handlerton instance is defined statically in ha_xxx.cc as
+
+  static handlerton { ... } xxx_hton;
 
+  savepoint_*, prepare, recover, and *_by_xid pointers can be 0.
+*/
 typedef struct
 {
-   byte slot;
+  /*
+    each storage engine has it's own memory area (actually a pointer)
+    in the thd, for storing per-connection information.
+    It is accessed as
+
+      thd->ha_data[xxx_hton.slot]
+
+   slot number is initialized by MySQL after xxx_init() is called.
+   */
+   uint slot;
+   /*
+     to store per-savepoint data storage engine is provided with an area
+     of a requested size (0 is ok here).
+     savepoint_offset must be initialized statically to the size of
+     the needed memory to store per-savepoint information.
+     After xxx_init it is changed to be an offset to savepoint storage
+     area and need not be used by storage engine.
+     see binlog_hton and binlog_savepoint_set/rollback for an example.
+   */
    uint savepoint_offset;
+   /*
+     handlerton methods:
+
+     close_connection is only called if
+     thd->ha_data[xxx_hton.slot] is non-zero, so even if you don't need
+     this storage area - set it to something, so that MySQL would know
+     this storage engine was accessed in this connection
+   */
    int  (*close_connection)(THD *thd);
+   /*
+     sv points to an uninitialized storage area of requested size
+     (see savepoint_offset description)
+   */
    int  (*savepoint_set)(THD *thd, void *sv);
+   /*
+     sv points to a storage area, that was earlier passed
+     to the savepoint_set call
+   */
    int  (*savepoint_rollback)(THD *thd, void *sv);
    int  (*savepoint_release)(THD *thd, void *sv);
+   /*
+     'all' is true if it's a real commit, that makes persistent changes
+     'all' is false if it's not in fact a commit but an end of the
+     statement that is part of the transaction.
+     NOTE 'all' is also false in auto-commit mode where 'end of statement'
+     and 'real commit' mean the same event.
+   */
    int  (*commit)(THD *thd, bool all);
    int  (*rollback)(THD *thd, bool all);
    int  (*prepare)(THD *thd, bool all);
@@ -234,6 +319,16 @@ typedef struct
    int  (*rollback_by_xid)(XID *xid);
 } handlerton;
 
+typedef struct st_thd_trans
+{
+  /* number of entries in the ht[] */
+  uint        nht;
+  /* true is not all entries in the ht[] support 2pc */
+  bool        no_2pc;
+  /* storage engines that registered themselves for this transaction */
+  handlerton *ht[MAX_HA];
+} THD_TRANS;
+
 enum enum_tx_isolation { ISO_READ_UNCOMMITTED, ISO_READ_COMMITTED,
 			 ISO_REPEATABLE_READ, ISO_SERIALIZABLE};
 
@@ -268,6 +363,9 @@ typedef struct st_table TABLE;
 struct st_foreign_key_info;
 typedef struct st_foreign_key_info FOREIGN_KEY_INFO;
 
+typedef struct st_savepoint SAVEPOINT;
+extern ulong savepoint_alloc_size;
+
 typedef struct st_ha_check_opt
 {
   ulong sort_buffer_size;
@@ -626,57 +724,72 @@ class handler :public Sql_alloc
 extern struct show_table_type_st sys_table_types[];
 extern const char *ha_row_type[];
 extern TYPELIB tx_isolation_typelib;
+extern handlerton *handlertons[MAX_HA];
+extern ulong total_ha, total_ha_2pc;
 
 	/* Wrapper functions */
-#define ha_commit_stmt(thd) (ha_commit_trans((thd), &((thd)->transaction.stmt)))
-#define ha_rollback_stmt(thd) (ha_rollback_trans((thd), &((thd)->transaction.stmt)))
-#define ha_commit(thd) (ha_commit_trans((thd), &((thd)->transaction.all)))
-#define ha_rollback(thd) (ha_rollback_trans((thd), &((thd)->transaction.all)))
+#define ha_commit_stmt(thd) (ha_commit_trans((thd), FALSE))
+#define ha_rollback_stmt(thd) (ha_rollback_trans((thd), FALSE))
+#define ha_commit(thd) (ha_commit_trans((thd), TRUE))
+#define ha_rollback(thd) (ha_rollback_trans((thd), TRUE))
 
 #define ha_supports_generate(T) (T != DB_TYPE_INNODB && \
                                  T != DB_TYPE_BERKELEY_DB && \
                                  T != DB_TYPE_NDBCLUSTER)
 
+/* lookups */
 enum db_type ha_resolve_by_name(const char *name, uint namelen);
 const char *ha_get_storage_engine(enum db_type db_type);
 handler *get_new_handler(TABLE *table, enum db_type db_type);
-my_off_t ha_get_ptr(byte *ptr, uint pack_length);
-void ha_store_ptr(byte *buff, uint pack_length, my_off_t pos);
+enum db_type ha_checktype(enum db_type database_type);
+
+/* basic stuff */
 int ha_init(void);
+TYPELIB *ha_known_exts(void);
 int ha_panic(enum ha_panic_function flag);
+int ha_update_statistics();
 void ha_close_connection(THD* thd);
-enum db_type ha_checktype(enum db_type database_type);
+bool ha_flush_logs(void);
+void ha_drop_database(char* path);
 int ha_create_table(const char *name, HA_CREATE_INFO *create_info,
 		    bool update_create_info);
+int ha_delete_table(enum db_type db_type, const char *path);
+
+/* discovery */
 int ha_create_table_from_engine(THD* thd, const char *db, const char *name,
 				bool create_if_found);
-int ha_delete_table(enum db_type db_type, const char *path);
-void ha_drop_database(char* path);
+int ha_discover(THD* thd, const char* dbname, const char* name,
+                const void** frmblob, uint* frmlen);
+int ha_find_files(THD *thd,const char *db,const char *path,
+                  const char *wild, bool dir,List<char>* files);
+int ha_table_exists(THD* thd, const char* db, const char* name);
+
+/* key cache */
 int ha_init_key_cache(const char *name, KEY_CACHE *key_cache);
 int ha_resize_key_cache(KEY_CACHE *key_cache);
 int ha_change_key_cache_param(KEY_CACHE *key_cache);
+int ha_change_key_cache(KEY_CACHE *old_key_cache, KEY_CACHE *new_key_cache);
 int ha_end_key_cache(KEY_CACHE *key_cache);
-int ha_start_stmt(THD *thd);
-int ha_report_binlog_offset_and_commit(THD *thd, char *log_file_name,
-				       my_off_t end_offset);
-int ha_commit_complete(THD *thd);
+
+/* weird stuff */
 int ha_release_temporary_latches(THD *thd);
-int ha_update_statistics();
-int ha_commit_trans(THD *thd, THD_TRANS *trans);
-int ha_rollback_trans(THD *thd, THD_TRANS *trans);
-int ha_rollback_to_savepoint(THD *thd, char *savepoint_name);
-int ha_savepoint(THD *thd, char *savepoint_name);
-int ha_release_savepoint_name(THD *thd, char *savepoint_name);
+
+/* transactions: interface to handlerton functions */
+int ha_start_consistent_snapshot(THD *thd);
+int ha_commit_or_rollback_by_xid(LEX_STRING *ident, bool commit);
+int ha_commit_one_phase(THD *thd, bool all);
+int ha_rollback_trans(THD *thd, bool all);
+int ha_prepare(THD *thd);
+int ha_recover(HASH *commit_list);
+
+/* transactions: these functions never call handlerton functions directly */
+int ha_commit_trans(THD *thd, bool all);
 int ha_autocommit_or_rollback(THD *thd, int error);
-void ha_set_spin_retries(uint retries);
-bool ha_flush_logs(void);
 int ha_enable_transaction(THD *thd, bool on);
-int ha_change_key_cache(KEY_CACHE *old_key_cache,
-			KEY_CACHE *new_key_cache);
-int ha_discover(THD* thd, const char* dbname, const char* name,
-		const void** frmblob, uint* frmlen);
-int ha_find_files(THD *thd,const char *db,const char *path,
-		  const char *wild, bool dir,List<char>* files);
-int ha_table_exists(THD* thd, const char* db, const char* name);
-TYPELIB *ha_known_exts(void);
-int ha_start_consistent_snapshot(THD *thd);
+void trans_register_ha(THD *thd, bool all, handlerton *ht);
+
+/* savepoints */
+int ha_rollback_to_savepoint(THD *thd, SAVEPOINT *sv);
+int ha_savepoint(THD *thd, SAVEPOINT *sv);
+int ha_release_savepoint(THD *thd, SAVEPOINT *sv);
+

sql/item_func.cc

@@ -2823,7 +2823,7 @@ void item_user_lock_release(User_level_lock *ull)
     tmp.copy(command, strlen(command), tmp.charset());
     tmp.append(ull->key,ull->key_length);
     tmp.append("\")", 2);
-    Query_log_event qev(current_thd, tmp.ptr(), tmp.length(),1, FALSE);
+    Query_log_event qev(current_thd, tmp.ptr(), tmp.length(), 0, FALSE);
     qev.error_code=0; // this query is always safe to run on slave
     mysql_bin_log.write(&qev);
   }

sql/lex.h

@@ -19,11 +19,11 @@
 
 #include "lex_symbol.h"
 
-/* We don't want to include sql_yacc.h into gen_lex_hash */
 SYM_GROUP sym_group_common= {"", ""};
 SYM_GROUP sym_group_geom= {"Spatial extentions", "HAVE_SPATIAL"};
 SYM_GROUP sym_group_rtree= {"RTree keys", "HAVE_RTREE_KEYS"};
 
+/* We don't want to include sql_yacc.h into gen_lex_hash */
 #ifdef NO_YACC_SYMBOLS
 #define SYM_OR_NULL(A) 0
 #else
@@ -314,6 +314,7 @@ static SYMBOL symbols[] = {
   { "MERGE",		SYM(MERGE_SYM)},
   { "MICROSECOND",	SYM(MICROSECOND_SYM)},
   { "MIDDLEINT",	SYM(MEDIUMINT)},	/* For powerbuilder */
+  { "MIGRATE",          SYM(MIGRATE_SYM)},
   { "MINUTE",		SYM(MINUTE_SYM)},
   { "MINUTE_MICROSECOND", SYM(MINUTE_MICROSECOND_SYM)},
   { "MINUTE_SECOND",	SYM(MINUTE_SECOND_SYM)},
@@ -346,6 +347,7 @@ static SYMBOL symbols[] = {
   { "OFFSET",		SYM(OFFSET_SYM)},
   { "OLD_PASSWORD",	SYM(OLD_PASSWORD)},
   { "ON",		SYM(ON)},
+  { "ONE",              SYM(ONE_SYM)},
   { "ONE_SHOT",		SYM(ONE_SHOT_SYM)},
   { "OPEN",		SYM(OPEN_SYM)},
   { "OPTIMIZE",		SYM(OPTIMIZE)},
@@ -359,6 +361,7 @@ static SYMBOL symbols[] = {
   { "PACK_KEYS",	SYM(PACK_KEYS_SYM)},
   { "PARTIAL",		SYM(PARTIAL)},
   { "PASSWORD",		SYM(PASSWORD)},
+  { "PHASE",            SYM(PHASE_SYM)},
   { "POINT",		SYM(POINT_SYM)},
   { "POLYGON",		SYM(POLYGON)},
   { "PRECISION",	SYM(PRECISION)},
@@ -380,6 +383,7 @@ static SYMBOL symbols[] = {
   { "READ",		SYM(READ_SYM)},
   { "READS",		SYM(READS_SYM)},
   { "REAL",		SYM(REAL)},
+  { "RECOVER",          SYM(RECOVER_SYM)},
   { "REDUNDANT",	SYM(REDUNDANT_SYM)},
   { "REFERENCES",	SYM(REFERENCES)},
   { "REGEXP",		SYM(REGEXP)},
@@ -398,6 +402,7 @@ static SYMBOL symbols[] = {
   { "RESET",		SYM(RESET_SYM)},
   { "RESTORE",		SYM(RESTORE_SYM)},
   { "RESTRICT",		SYM(RESTRICT)},
+  { "RESUME",           SYM(RESUME_SYM)},
   { "RETURN",           SYM(RETURN_SYM)},
   { "RETURNS",		SYM(RETURNS_SYM)},
   { "REVOKE",		SYM(REVOKE)},
@@ -467,6 +472,7 @@ static SYMBOL symbols[] = {
   { "STRIPED",		SYM(RAID_STRIPED_SYM)},
   { "SUBJECT",		SYM(SUBJECT_SYM)},
   { "SUPER",		SYM(SUPER_SYM)},
+  { "SUSPEND",          SYM(SUSPEND_SYM)},
   { "TABLE",		SYM(TABLE_SYM)},
   { "TABLES",		SYM(TABLES)},
   { "TABLESPACE",	SYM(TABLESPACE)},
@@ -528,6 +534,7 @@ static SYMBOL symbols[] = {
   { "WRITE",		SYM(WRITE_SYM)},
   { "X509",		SYM(X509_SYM)},
   { "XOR",		SYM(XOR)},
+  { "XA",               SYM(XA_SYM)},
   { "YEAR",		SYM(YEAR_SYM)},
   { "YEAR_MONTH",	SYM(YEAR_MONTH_SYM)},
   { "ZEROFILL",		SYM(ZEROFILL)},

sql/log_event.h

@@ -302,6 +302,41 @@ struct sql_ex_info
 #define LOG_EVENT_TIME_F            0x1
 #define LOG_EVENT_FORCED_ROTATE_F   0x2
 #endif
+
+/*
+   This flag only makes sense for Format_description_log_event. It is set
+   when the event is written, and *reset* when a binlog file is
+   closed (yes, it's the only case when MySQL modifies already written
+   part of binlog).  Thus it is a reliable indicator that binlog was
+   closed correctly.  (Stop_log_event is not enough, there's always a
+   small chance that mysqld crashes in the middle of insert and end of
+   the binlog would look like a Stop_log_event).
+
+   This flag is used to detect a restart after a crash,
+   and to provide "unbreakable" binlog. The problem is that on a crash
+   storage engines rollback automatically, while binlog does not.
+   To solve this we use this flag and automatically append ROLLBACK
+   to every non-closed binlog (append virtually, on reading, file itself
+   is not changed). If this flag is found, mysqlbinlog simply prints "ROLLBACK"
+   Replication master does not abort on binlog corruption, but takes it as EOF,
+   and replication slave forces a rollback in this case (see below).
+
+   Note, that old binlogs does not have this flag set, so we get a
+   a backward-compatible behaviour.
+*/
+
+#define LOG_EVENT_BINLOG_IN_USE_F       0x1
+
+/*
+  This flag is only used for fake Rotate_log_event. When a master, doing
+  binlog dump, reaches the end of the binlog and fakes a rotate to make
+  the slave to go to a new file, this flag is used if there was no
+  "natural" Rotate_log_event.
+  If this flag is set, slave will execute ROLLBACK before going further
+*/
+
+#define LOG_EVENT_FORCE_ROLLBACK_F      0x1
+
 /*
    If the query depends on the thread (for example: TEMPORARY TABLE).
    Currently this is used by mysqlbinlog to know it must print
@@ -310,26 +345,6 @@ struct sql_ex_info
 */
 #define LOG_EVENT_THREAD_SPECIFIC_F 0x4
 
-/*
-   OPTIONS_WRITTEN_TO_BIN_LOG are the bits of thd->options which must be written
-   to the binlog. OPTIONS_WRITTEN_TO_BINLOG could be written into the
-   Format_description_log_event, so that if later we don't want to replicate a
-   variable we did replicate, or the contrary, it's doable. But it should not be
-   too hard to decide once for all of what we replicate and what we don't, among
-   the fixed 32 bits of thd->options.
-   I (Guilhem) have read through every option's usage, and it looks like
-   OPTION_AUTO_IS_NULL and OPTION_NO_FOREIGN_KEYS are the only ones which alter
-   how the query modifies the table. It's good to replicate
-   OPTION_RELAXED_UNIQUE_CHECKS too because otherwise, the slave may insert data
-   slower than the master, in InnoDB.
-   OPTION_BIG_SELECTS is not needed (the slave thread runs with
-   max_join_size=HA_POS_ERROR) and OPTION_BIG_TABLES is not needed either, as
-   the manual says (because a too big in-memory temp table is automatically
-   written to disk).
-*/
-#define OPTIONS_WRITTEN_TO_BIN_LOG (OPTION_AUTO_IS_NULL | \
-OPTION_NO_FOREIGN_KEY_CHECKS | OPTION_RELAXED_UNIQUE_CHECKS)
-
 /*
   Suppress the generation of 'USE' statements before the actual
   statement. This flag should be set for any events that does not need
@@ -343,24 +358,51 @@ OPTION_NO_FOREIGN_KEY_CHECKS | OPTION_RELAXED_UNIQUE_CHECKS)
  */
 #define LOG_EVENT_SUPPRESS_USE_F    0x8
 
+/*
+   OPTIONS_WRITTEN_TO_BIN_LOG are the bits of thd->options which must be
+   written to the binlog. OPTIONS_WRITTEN_TO_BINLOG could be written
+   into the Format_description_log_event, so that if later we don't want
+   to replicate a variable we did replicate, or the contrary, it's
+   doable. But it should not be too hard to decide once for all of what
+   we replicate and what we don't, among the fixed 32 bits of
+   thd->options.
+   I (Guilhem) have read through every option's usage, and it looks like
+   OPTION_AUTO_IS_NULL and OPTION_NO_FOREIGN_KEYS are the only ones
+   which alter how the query modifies the table. It's good to replicate
+   OPTION_RELAXED_UNIQUE_CHECKS too because otherwise, the slave may
+   insert data slower than the master, in InnoDB.
+   OPTION_BIG_SELECTS is not needed (the slave thread runs with
+   max_join_size=HA_POS_ERROR) and OPTION_BIG_TABLES is not needed
+   either, as the manual says (because a too big in-memory temp table is
+   automatically written to disk).
+*/
+#define OPTIONS_WRITTEN_TO_BIN_LOG (OPTION_AUTO_IS_NULL | \
+OPTION_NO_FOREIGN_KEY_CHECKS | OPTION_RELAXED_UNIQUE_CHECKS)
+
 enum Log_event_type
 {
   /*
     Every time you update this enum (when you add a type), you have to
-    update the code of Format_description_log_event::Format_description_log_event().
-    Make sure you always insert new types ***BEFORE*** ENUM_END_EVENT.
+    fix Format_description_log_event::Format_description_log_event().
   */
   UNKNOWN_EVENT= 0, START_EVENT_V3, QUERY_EVENT, STOP_EVENT, ROTATE_EVENT,
   INTVAR_EVENT, LOAD_EVENT, SLAVE_EVENT, CREATE_FILE_EVENT,
   APPEND_BLOCK_EVENT, EXEC_LOAD_EVENT, DELETE_FILE_EVENT,
   /*
-    NEW_LOAD_EVENT is like LOAD_EVENT except that it has a longer sql_ex,
-    allowing multibyte TERMINATED BY etc; both types share the same class
-    (Load_log_event)
+    NEW_LOAD_EVENT is like LOAD_EVENT except that it has a longer
+    sql_ex, allowing multibyte TERMINATED BY etc; both types share the
+    same class (Load_log_event)
   */
   NEW_LOAD_EVENT,
   RAND_EVENT, USER_VAR_EVENT,
   FORMAT_DESCRIPTION_EVENT,
+  XID_EVENT,
+
+  /*
+    add new events here - right above this comment!
+    existing events should never change their numbers
+  */
+
   ENUM_END_EVENT /* end marker */
 };
 
@@ -461,16 +503,15 @@ class Log_event
   ulong data_written;
 
   /*
-    The master's server id (is preserved in the relay log; used to prevent from
-    infinite loops in circular replication).
+    The master's server id (is preserved in the relay log; used to
+    prevent from infinite loops in circular replication).
   */
   uint32 server_id;
 
   /*
-    Some 16 flags. Only one is really used now; look above for
-    LOG_EVENT_TIME_F, LOG_EVENT_FORCED_ROTATE_F,
-    LOG_EVENT_THREAD_SPECIFIC_F, and LOG_EVENT_SUPPRESS_USE_F for
-    notes.
+    Some 16 flags. Look above for LOG_EVENT_TIME_F,
+    LOG_EVENT_FORCED_ROTATE_F, LOG_EVENT_THREAD_SPECIFIC_F, and
+    LOG_EVENT_SUPPRESS_USE_F for notes.
   */
   uint16 flags;
 
@@ -566,11 +607,11 @@ class Log_event
       temp_buf = 0;
     }
   }
-  virtual int get_data_size() { return 0;}
   /*
     Get event length for simple events. For complicated events the length
     is calculated during write()
   */
+  virtual int get_data_size() { return 0;}
   static Log_event* read_log_event(const char* buf, uint event_len,
 				   const char **error,
                                    const Format_description_log_event
@@ -1037,6 +1078,40 @@ class Rand_log_event: public Log_event
   bool is_valid() const { return 1; }
 };
 
+/*****************************************************************************
+
+  Xid Log Event class
+
+  Logs xid of the transaction-to-be-committed in the 2pc protocol.
+  Has no meaning in replication, slaves ignore it.
+
+ ****************************************************************************/
+#ifdef MYSQL_CLIENT
+typedef ulong my_xid;
+#endif
+
+class Xid_log_event: public Log_event
+{
+ public:
+   my_xid xid;
+
+#ifndef MYSQL_CLIENT
+  Xid_log_event(THD* thd_arg, my_xid x): Log_event(thd_arg,0,0), xid(x) {}
+#ifdef HAVE_REPLICATION
+  void pack_info(Protocol* protocol);
+  int exec_event(struct st_relay_log_info* rli);
+#endif /* HAVE_REPLICATION */
+#else
+  void print(FILE* file, bool short_form = 0, LAST_EVENT_INFO* last_event_info= 0);
+#endif
+
+  Xid_log_event(const char* buf, const Format_description_log_event* description_event);
+  ~Xid_log_event() {}
+  Log_event_type get_type_code() { return XID_EVENT;}
+  int get_data_size() { return sizeof(xid); }
+  bool write(IO_CACHE* file);
+  bool is_valid() const { return 1; }
+};
 
 /*****************************************************************************
 
@@ -1086,8 +1161,6 @@ class User_var_log_event: public Log_event
   Stop Log Event class
 
  ****************************************************************************/
-#ifdef HAVE_REPLICATION
-
 class Stop_log_event: public Log_event
 {
 public:
@@ -1107,14 +1180,11 @@ class Stop_log_event: public Log_event
   bool is_valid() const { return 1; }
 };
 
-#endif /* HAVE_REPLICATION */
-
-
 /*****************************************************************************
 
   Rotate Log Event class
 
-  This will be depricated when we move to using sequence ids.
+  This will be deprecated when we move to using sequence ids.
 
  ****************************************************************************/
 

sql/mysql_priv.h

@@ -409,9 +409,16 @@ inline THD *_current_thd(void)
 }
 #define current_thd _current_thd()
 
+/*
+  External variables
+*/
+extern ulong server_id, concurrency;
+
+
 typedef my_bool (*qc_engine_callback)(THD *thd, char *table_key,
                                       uint key_length,
                                       ulonglong *engine_data);
+
 #include "sql_string.h"
 #include "sql_list.h"
 #include "sql_map.h"
@@ -572,6 +579,8 @@ bool mysql_preload_keys(THD* thd, TABLE_LIST* table_list);
 int reassign_keycache_tables(THD* thd, KEY_CACHE *src_cache,
                              KEY_CACHE *dst_cache);
 
+bool mysql_xa_recover(THD *thd);
+
 bool check_simple_select();
 
 SORT_FIELD * make_unireg_sortorder(ORDER *order, uint *length);
@@ -944,11 +953,9 @@ void sql_print_information(const char *format, ...);
 
 bool fn_format_relative_to_data_home(my_string to, const char *name,
 				     const char *dir, const char *extension);
-bool open_log(MYSQL_LOG *log, const char *hostname,
-	      const char *opt_name, const char *extension,
-	      const char *index_file_name,
-	      enum_log_type type, bool read_append,
-	      bool no_auto_events, ulong max_size);
+File open_binlog(IO_CACHE *log, const char *log_file_name,
+                 const char **errmsg);
+handlerton *binlog_init();
 
 /* mysqld.cc */
 extern void yyerror(const char*);
@@ -1003,7 +1010,7 @@ extern double last_query_cost;
 extern double log_10[32];
 extern ulonglong log_10_int[20];
 extern ulonglong keybuff_size;
-extern ulong refresh_version,flush_version, thread_id,query_id;
+extern ulong refresh_version,flush_version, thread_id;
 extern ulong binlog_cache_use, binlog_cache_disk_use;
 extern ulong aborted_threads,aborted_connects;
 extern ulong delayed_insert_timeout;
@@ -1013,8 +1020,6 @@ extern ulong delayed_rows_in_use,delayed_insert_errors;
 extern ulong slave_open_temp_tables;
 extern ulong query_cache_size, query_cache_min_res_unit;
 extern ulong thd_startup_options, slow_launch_threads, slow_launch_time;
-extern ulong server_id, concurrency;
-extern ulong ha_read_count, ha_discover_count;
 extern ulong table_cache_size;
 extern ulong max_connections,max_connect_errors, connect_timeout;
 extern ulong slave_net_timeout;
@@ -1056,6 +1061,7 @@ extern uint opt_large_page_size;
 
 extern MYSQL_LOG mysql_log,mysql_slow_log,mysql_bin_log;
 extern FILE *bootstrap_file;
+extern int bootstrap_error;
 extern pthread_key(MEM_ROOT**,THR_MALLOC);
 extern pthread_mutex_t LOCK_mysql_create_db,LOCK_Acl,LOCK_open,
        LOCK_thread_count,LOCK_mapped_file,LOCK_user_locks, LOCK_status,
@@ -1259,6 +1265,14 @@ SQL_CRYPT *get_crypt_for_frm(void);
 
 #include "sql_view.h"
 
+/* query_id */
+
+typedef ulonglong query_id_t;
+extern query_id_t query_id;
+
+/* increment query_id and return it.  */
+inline query_id_t next_query_id() { return query_id++; }
+
 /* Some inline functions for more speed */
 
 inline bool add_item_to_list(THD *thd, Item *item)

sql/set_var.h

@@ -778,7 +778,7 @@ class set_var :public set_var_base
   } save_result;
   LEX_STRING base;			/* for structs */
 
-  set_var(enum_var_type type_arg, sys_var *var_arg, LEX_STRING *base_name_arg,
+  set_var(enum_var_type type_arg, sys_var *var_arg, const LEX_STRING *base_name_arg,
 	  Item *value_arg)
     :var(var_arg), type(type_arg), base(*base_name_arg)
   {

sql/share/errmsg.txt

@@ -5306,6 +5306,18 @@ ER_CANNOT_USER
 	eng "Operation %s failed for %.256s"
 	ger "Das Kommando %s scheiterte fr %.256s"
 	norwegian-ny "Operation %s failed for '%.256s'"
+ER_XAER_NOTA XAE04
+        eng "XAER_NOTA: Unknown XID"
+ER_XAER_INVAL XAE05
+        eng "XAER_INVAL: Invalid arguments (or unsupported command)"
+ER_XAER_RMFAIL XAE07
+        eng "XAER_RMFAIL: The command cannot be executed in the %.64s state"
+ER_XAER_OUTSIDE XAE09
+        eng "XAER_OUTSIDE: Some work is done outside global transaction"
+ER_XAER_RMERR XAE03
+        eng "XAER_RMERR: Fatal error occurred in the transaction branch - check your data for consistency"
+ER_XA_RBROLLBACK XA100
+        eng "XA_RBROLLBACK: Transaction branch was rolled back"
 ER_NONEXISTING_PROC_GRANT 42000 
 	eng "There is no such grant defined for user '%-.32s' on host '%-.64s' on routine '%-.64s'"
 ER_PROC_AUTO_GRANT_FAIL

sql/slave.h

@@ -550,7 +550,6 @@ int init_master_info(MASTER_INFO* mi, const char* master_info_fname,
 		     bool abort_if_no_master_info_file,
 		     int thread_mask);
 void end_master_info(MASTER_INFO* mi);
-int init_relay_log_info(RELAY_LOG_INFO* rli, const char* info_fname);
 void end_relay_log_info(RELAY_LOG_INFO* rli);
 void lock_slave_threads(MASTER_INFO* mi);
 void unlock_slave_threads(MASTER_INFO* mi);

sql/sp_head.cc

@@ -1243,7 +1243,7 @@ sp_instr_stmt::exec_stmt(THD *thd, LEX *lex)
   thd->free_list= NULL;
 
   VOID(pthread_mutex_lock(&LOCK_thread_count));
-  thd->query_id= query_id++;
+  thd->query_id= next_query_id();
   VOID(pthread_mutex_unlock(&LOCK_thread_count));
 
   reset_stmt_for_execute(thd, lex);

sql/sql_base.cc

@@ -384,8 +384,8 @@ void close_thread_tables(THD *thd, bool lock_in_use, bool skip_derived,
   {
     TABLE *table, *next;
     /*
-      Close all derived tables generated from questions like
-      SELECT * from (select * from t1))
+      Close all derived tables generated in queries like
+      SELECT * FROM (SELECT * FROM t1)
     */
     for (table= thd->derived_tables ; table ; table= next)
     {
@@ -405,6 +405,18 @@ void close_thread_tables(THD *thd, bool lock_in_use, bool skip_derived,
     mysql_unlock_tables(thd, thd->lock);
     thd->lock=0;
   }
+  /*
+    assume handlers auto-commit (if some doesn't - transaction handling
+    in MySQL should be redesigned to support it; it's a big change,
+    and it's not worth it - better to commit explicitly only writing
+    transactions, read-only ones should better take care of themselves.
+    saves some work in 2pc too)
+    see also sql_parse.cc - dispatch_command()
+  */
+  bzero(&thd->transaction.stmt, sizeof(thd->transaction.stmt));
+  if (!thd->active_transaction())
+    thd->transaction.xid.null();
+
   /* VOID(pthread_sigmask(SIG_SETMASK,&thd->block_signals,NULL)); */
   if (!lock_in_use)
     VOID(pthread_mutex_lock(&LOCK_open));
@@ -1824,7 +1836,7 @@ TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type lock_type)
     -1 - error
 
   NOTE
-    The lock will automaticly be freed by close_thread_tables()
+    The lock will automaticaly be freed by close_thread_tables()
 */
 
 int simple_open_n_lock_tables(THD *thd, TABLE_LIST *tables)
@@ -1851,7 +1863,7 @@ int simple_open_n_lock_tables(THD *thd, TABLE_LIST *tables)
     TRUE  - error
 
   NOTE
-    The lock will automaticly be freed by close_thread_tables()
+    The lock will automaticaly be freed by close_thread_tables()
 */
 
 bool open_and_lock_tables(THD *thd, TABLE_LIST *tables)

sql/sql_insert.cc

@@ -168,7 +168,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
     runs without --log-update or --log-bin).
   */
   bool log_on= (thd->options & OPTION_BIN_LOG) || (!(thd->master_access & SUPER_ACL));
-  bool transactional_table, log_delayed;
+  bool transactional_table;
   uint value_count;
   ulong counter = 1;
   ulonglong id;
@@ -433,7 +433,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
     /*
       Invalidate the table in the query cache if something changed.
       For the transactional algorithm to work the invalidation must be
-      before binlog writing and ha_autocommit_...
+      before binlog writing and ha_autocommit_or_rollback
     */
     if (info.copied || info.deleted || info.updated)
     {
@@ -442,7 +442,6 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
 
     transactional_table= table->file->has_transactions();
 
-    log_delayed= (transactional_table || table->s->tmp_table);
     if ((info.copied || info.deleted || info.updated) &&
 	(error <= 0 || !transactional_table))
     {
@@ -451,11 +450,11 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
         if (error <= 0)
           thd->clear_error();
 	Query_log_event qinfo(thd, thd->query, thd->query_length,
-			      log_delayed, FALSE);
+			      transactional_table, FALSE);
 	if (mysql_bin_log.write(&qinfo) && transactional_table)
 	  error=1;
       }
-      if (!log_delayed)
+      if (!transactional_table)
 	thd->options|=OPTION_STATUS_NO_TRANS_UPDATE;
     }
     if (transactional_table)
@@ -1970,7 +1969,7 @@ bool select_insert::send_eof()
 
   /*
     We must invalidate the table in the query cache before binlog writing
-    and ha_autocommit_...
+    and ha_autocommit_or_rollback
   */
 
   if (info.copied || info.deleted || info.updated)