List:Commits« Previous MessageNext Message »
From:Andrei Elkin Date:October 13 2007 8:41pm
Subject:bk commit into 5.1 tree (aelkin:1.2605) BUG#20435
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of aelkin. When aelkin does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-10-13 22:41:12+02:00, aelkin@stripped +79 -0
  Bug#20435 Relay logs are rotated at slave_net_timeout when there's no activity; WL#342 heartbeat
  
  When receiving no events from its master longer than slave_net_timeout
  slave's replication io thread disconnects and reconnects. Reconnecting
  causes rotation of the relay log. That is unnecessary work which also
  causes inconvenience because of changes of the relay log files names:
  old files are removed, new are created.
    
    Fixed with introducing the Heartbeat event new functionality.
    Heartbeat event is generated in master's idle time by dump thread.
    Frequency of sending the event is optional and is determined by slave.
    The optimal value is within [0.001, slave_net_timeout] interval.
    
    The project introduces master_heartbeat_period option for CHANGE
    MASTER sql clause.  The requested on the slave side value for the
    period is passed to the dump thread on the master side.  The dump
    thread sends a heartbeat replication event if there is no more
    unsent events in the actual binlog file for a period longer that
    master_heartbeat_period.  Whenever the master's binlog is updated
    with an event, the waiting for heartbeat sending condition gets
    reset.
    
    Heartbeating is requested implicitly with the period
    slave_net_timeout/2 when no master_heartbeat_option was
    provided. if the option's value is set explicitly zero there will
    be no heartbeats.
    slave_net_timeout is updated now with generating a warning if the
    new value is less than the current heartbeat period.
  
    Two status variables on the slave side allows to monitor
    heartbeats flow.
    
    The test checks the syntax for the new option, the valid range -
    errors and warnings on reasonable values; the fact that there is no
    relay log rotation (thereafter no reconnection) while more than
    slave_net_timeout seconds elapsed and the master has been idling;
    new status variables.

  mysql-test/extra/binlog_tests/binlog.test@stripped, 2007-10-13 22:40:56+02:00, aelkin@stripped +2 -2
    FD size changed

  mysql-test/extra/rpl_tests/rpl_deadlock.test@stripped, 2007-10-13 22:40:56+02:00, aelkin@stripped +2 -2
    FD size changed

  mysql-test/extra/rpl_tests/rpl_loaddata.test@stripped, 2007-10-13 22:40:56+02:00, aelkin@stripped +3 -3
    vertical show

  mysql-test/extra/rpl_tests/rpl_log.test@stripped, 2007-10-13 22:40:56+02:00, aelkin@stripped +3 -3
     FD size changed. Todo: for the test turn `show' query into source includ/show_binlog_events

  mysql-test/include/show_binlog_events.inc@stripped, 2007-10-13 22:40:56+02:00, aelkin@stripped +1 -1
     FD size changed

  mysql-test/include/show_binlog_events2.inc@stripped, 2007-10-13 22:40:56+02:00, aelkin@stripped +1 -1
     FD size changed

  mysql-test/r/ctype_cp932_binlog_stm.result@stripped, 2007-10-13 22:40:57+02:00, aelkin@stripped +7 -7
     FD size changed

  mysql-test/r/flush_block_commit_notembedded.result@stripped, 2007-10-13 22:40:57+02:00, aelkin@stripped +2 -2
     FD size changed

  mysql-test/r/innodb.result@stripped, 2007-10-13 22:40:57+02:00, aelkin@stripped +2 -2
     FD size changed

  mysql-test/r/multi_update.result@stripped, 2007-10-13 22:40:57+02:00, aelkin@stripped +2 -2
     FD size changed

  mysql-test/r/sp_trans_log.result@stripped, 2007-10-13 22:40:57+02:00, aelkin@stripped +5 -5
     FD size changed

  mysql-test/suite/binlog/r/binlog_row_binlog.result@stripped, 2007-10-13 22:40:57+02:00, aelkin@stripped +819 -819
     FD size changed

  mysql-test/suite/binlog/r/binlog_stm_binlog.result@stripped, 2007-10-13 22:40:57+02:00, aelkin@stripped +422 -422
     FD size changed

  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result@stripped, 2007-10-13 22:40:57+02:00, aelkin@stripped +16 -16
     FD size changed

  mysql-test/suite/binlog/t/binlog_killed.test@stripped, 2007-10-13 22:40:58+02:00, aelkin@stripped +1 -1
    FD size changed

  mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test@stripped, 2007-10-13 22:40:58+02:00, aelkin@stripped +1 -1
    FD size changed

  mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test@stripped, 2007-10-13 22:40:58+02:00, aelkin@stripped +3 -5
    FD size changed

  mysql-test/suite/rpl/r/rpl_000015.result@stripped, 2007-10-13 22:40:58+02:00, aelkin@stripped +3 -3
    FD size changed

  mysql-test/suite/rpl/r/rpl_change_master.result@stripped, 2007-10-13 22:40:58+02:00, aelkin@stripped +2 -2
    FD size changed

  mysql-test/suite/rpl/r/rpl_deadlock_innodb.result@stripped, 2007-10-13 22:40:58+02:00, aelkin@stripped +2 -2
    FD size changed

  mysql-test/suite/rpl/r/rpl_flushlog_loop.result@stripped, 2007-10-13 22:40:58+02:00, aelkin@stripped +2 -2
    FD size changed

  mysql-test/suite/rpl/r/rpl_grant.result@stripped, 2007-10-13 22:40:58+02:00, aelkin@stripped +2 -2
    FD size changed

  mysql-test/suite/rpl/r/rpl_heartbeat.result@stripped, 2007-10-13 22:41:06+02:00, aelkin@stripped +137 -0
    new result file

  mysql-test/suite/rpl/r/rpl_heartbeat.result@stripped, 2007-10-13 22:41:06+02:00, aelkin@stripped +0 -0

  mysql-test/suite/rpl/r/rpl_innodb_bug28430.result@stripped, 2007-10-13 22:40:59+02:00, aelkin@stripped +4 -4
    FD size changed

  mysql-test/suite/rpl/r/rpl_known_bugs_detection.result@stripped, 2007-10-13 22:40:59+02:00, aelkin@stripped +2 -2
    FD size changed

  mysql-test/suite/rpl/r/rpl_loaddata.result@stripped, 2007-10-13 22:40:59+02:00, aelkin@stripped +118 -10
    FD size changed

  mysql-test/suite/rpl/r/rpl_loaddata_fatal.result@stripped, 2007-10-13 22:40:59+02:00, aelkin@stripped +4 -4
    FD size changed

  mysql-test/suite/rpl/r/rpl_log_pos.result@stripped, 2007-10-13 22:40:59+02:00, aelkin@stripped +8 -8
    FD size changed

  mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result@stripped, 2007-10-13 22:40:59+02:00, aelkin@stripped +2 -2
    FD size changed

  mysql-test/suite/rpl/r/rpl_rotate_logs.result@stripped, 2007-10-13 22:40:59+02:00, aelkin@stripped +18 -18
    FD size changed

  mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result@stripped, 2007-10-13 22:40:59+02:00, aelkin@stripped +4 -4
    FD size changed

  mysql-test/suite/rpl/r/rpl_row_create_table.result@stripped, 2007-10-13 22:40:59+02:00, aelkin@stripped +61 -61
    FD size changed

  mysql-test/suite/rpl/r/rpl_row_drop.result@stripped, 2007-10-13 22:41:00+02:00, aelkin@stripped +4 -4
    FD size changed

  mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result@stripped, 2007-10-13 22:41:00+02:00, aelkin@stripped +2 -2
    FD size changed

  mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result@stripped, 2007-10-13 22:41:00+02:00, aelkin@stripped +2 -2
    FD size changed

  mysql-test/suite/rpl/r/rpl_row_log.result@stripped, 2007-10-13 22:41:00+02:00, aelkin@stripped +9 -9
    FD size changed

  mysql-test/suite/rpl/r/rpl_row_log_innodb.result@stripped, 2007-10-13 22:41:00+02:00, aelkin@stripped +9 -9
    FD size changed

  mysql-test/suite/rpl/r/rpl_row_max_relay_size.result@stripped, 2007-10-13 22:41:00+02:00, aelkin@stripped +11 -11
    FD size changed

  mysql-test/suite/rpl/r/rpl_row_reset_slave.result@stripped, 2007-10-13 22:41:00+02:00, aelkin@stripped +6 -6
    FD size changed

  mysql-test/suite/rpl/r/rpl_row_until.result@stripped, 2007-10-13 22:41:00+02:00, aelkin@stripped +8 -8
    FD size changed

  mysql-test/suite/rpl/r/rpl_server_id1.result@stripped, 2007-10-13 22:41:01+02:00, aelkin@stripped +1 -1
    FD size changed

  mysql-test/suite/rpl/r/rpl_server_id2.result@stripped, 2007-10-13 22:41:01+02:00, aelkin@stripped +1 -1
    FD size changed

  mysql-test/suite/rpl/r/rpl_skip_error.result@stripped, 2007-10-13 22:41:01+02:00, aelkin@stripped +39 -4
    result is non-deterministic (a bug is reported)

  mysql-test/suite/rpl/r/rpl_slave_skip.result@stripped, 2007-10-13 22:41:01+02:00, aelkin@stripped +4 -4
    FD size changed

  mysql-test/suite/rpl/r/rpl_sp.result@stripped, 2007-10-13 22:41:01+02:00, aelkin@stripped +85 -85
    FD size changed

  mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result@stripped, 2007-10-13 22:41:01+02:00, aelkin@stripped +2 -2
    FD size changed

  mysql-test/suite/rpl/r/rpl_stm_log.result@stripped, 2007-10-13 22:41:01+02:00, aelkin@stripped +9 -9
    FD size changed

  mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result@stripped, 2007-10-13 22:41:01+02:00, aelkin@stripped +11 -11
    FD size changed

  mysql-test/suite/rpl/r/rpl_stm_reset_slave.result@stripped, 2007-10-13 22:41:02+02:00, aelkin@stripped +6 -6
    FD size changed

  mysql-test/suite/rpl/r/rpl_stm_until.result@stripped, 2007-10-13 22:41:02+02:00, aelkin@stripped +8 -8
    FD size changed

  mysql-test/suite/rpl/t/rpl_heartbeat.test@stripped, 2007-10-13 22:41:06+02:00, aelkin@stripped +166 -0
    new feature tests

  mysql-test/suite/rpl/t/rpl_heartbeat.test@stripped, 2007-10-13 22:41:06+02:00, aelkin@stripped +0 -0

  mysql-test/suite/rpl/t/rpl_log_pos.test@stripped, 2007-10-13 22:41:02+02:00, aelkin@stripped +2 -2
    FD size changed

  mysql-test/suite/rpl/t/rpl_row_create_table.test@stripped, 2007-10-13 22:41:02+02:00, aelkin@stripped +6 -6
    FD size changed

  mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test@stripped, 2007-10-13 22:41:02+02:00, aelkin@stripped +1 -1
    FD size changed

  mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test@stripped, 2007-10-13 22:41:02+02:00, aelkin@stripped +2 -2
    FD size changed

  mysql-test/suite/rpl/t/rpl_skip_error.test@stripped, 2007-10-13 22:41:02+02:00, aelkin@stripped +1 -1
    vertical show. Notice, there is a bug with this test current (non-determinism in binlog-format)

  mysql-test/suite/rpl/t/rpl_sp.test@stripped, 2007-10-13 22:41:02+02:00, aelkin@stripped +1 -3
    FD size changed

  mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test@stripped, 2007-10-13 22:41:03+02:00, aelkin@stripped +1 -1
    FD size changed

  mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result@stripped, 2007-10-13 22:41:03+02:00, aelkin@stripped +9 -9
    FD size changed

  mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result@stripped, 2007-10-13 22:41:03+02:00, aelkin@stripped +2 -2
    FD size changed

  mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result@stripped, 2007-10-13 22:41:03+02:00, aelkin@stripped +34 -34
    FD size changed

  mysql-test/t/ctype_cp932_binlog_stm.test@stripped, 2007-10-13 22:41:03+02:00, aelkin@stripped +3 -3
    FD size changed

  mysql-test/t/mysqlbinlog.test@stripped, 2007-10-13 22:41:03+02:00, aelkin@stripped +2 -2
    FD size changed

  mysql-test/t/mysqlbinlog2.test@stripped, 2007-10-13 22:41:03+02:00, aelkin@stripped +10 -10
    FD size changed

  mysql-test/t/sp_trans_log.test@stripped, 2007-10-13 22:41:03+02:00, aelkin@stripped +2 -1
    FD size changed

  sql/lex.h@stripped, 2007-10-13 22:41:04+02:00, aelkin@stripped +1 -0
     master_heartbeat_period token for parser

  sql/log.cc@stripped, 2007-10-13 22:41:04+02:00, aelkin@stripped +44 -20
    refactoring wait_update into two methods. The former code executes on slave side and the master's version
      is different in three points: does not unlock LOCK_log, unlocking happens right after the loop; timedwait
      instead of wait for condition signal; master's version returns an error as integer.

  sql/log.h@stripped, 2007-10-13 22:41:04+02:00, aelkin@stripped +2 -1
     refactoring of wait_for_update into two separate  slave/master methods.

  sql/log_event.cc@stripped, 2007-10-13 22:41:04+02:00, aelkin@stripped +13 -0
    Heartbeat constructor definition for slave side. There is none for master.

  sql/log_event.h@stripped, 2007-10-13 22:41:04+02:00, aelkin@stripped +58 -0
    Heartbeat related declarations.
      struct event_coordinates to consists of master binlog file name and the last read from it event's position.
      Heartbeat class to base on Log_event.
      Heartbeat instance is similar to an artificial Rotate event: carries similar info and is not relay-logged.

  sql/mysqld.cc@stripped, 2007-10-13 22:41:04+02:00, aelkin@stripped +36 -0
    Definitions for SHOW STATUS like 'Slave_heartbeat_period', 'Slave_received_heartbeats'.

  sql/rpl_mi.cc@stripped, 2007-10-13 22:41:05+02:00, aelkin@stripped +26 -6
    extending Master_info:
      master_info new members handling: initialization and storing into master.info.
      initialization of heartbeat counter's placeholder.

  sql/rpl_mi.h@stripped, 2007-10-13 22:41:05+02:00, aelkin@stripped +2 -0
     new members to master_info

  sql/share/errmsg.txt@stripped, 2007-10-13 22:41:06+02:00, aelkin@stripped +4 -0
    Two new errors for slave side for heartbeat.

  sql/slave.cc@stripped, 2007-10-13 22:41:05+02:00, aelkin@stripped +106 -11
    Convenience function to extract a float from master.info.
      Transforming a float value to an integer of nanoseconds (ulonglong).
      Sending the period value to master as ulonglong of nanoseconds
      in order to consume the value by master without any conversions.
      
      Refactoring queue_event calling point to fill the error report by the
      function. The report can be also about inconsistent heartbeat.
      Refactored wait_for_update is called now wait_for_update_relay_log if
      slave calls it.
      
      An interface function init_floatvar_from_file() to read a float value
      from file.

  sql/slave.h@stripped, 2007-10-13 22:41:05+02:00, aelkin@stripped +10 -1
    Max requestable heartbeat period define.

  sql/sql_lex.h@stripped, 2007-10-13 22:41:05+02:00, aelkin@stripped +3 -2
     new memeber in lex as interface to mi->heartbeat_period

  sql/sql_repl.cc@stripped, 2007-10-13 22:41:05+02:00, aelkin@stripped +166 -17
      (mostly) master side dump thread changes
        
            - conviniece functions
                extacting nanoseconds of heartbeat from user variable
                sending heartbeat;
            - changes in binlog_send 
                - init master_last_event_log_pos from the arg of the function
                - extract pos from read event
                - loop with sending heartbeat event on each cycle until a new event breaks in.
            - passing parser's value of the heartbeat into master_info of active_mi.
         
            - agreegating file name and pos into event_coordinates struct across master's code.
            
            - part of implementation of implicit heartbeat period (slave_net_timeout/2)
            - post-update to slave_net_timeout

  sql/sql_yacc.yy@stripped, 2007-10-13 22:41:06+02:00, aelkin@stripped +44 -4
     new rule for master_heartbeat_period option. checking the valid range. Clicking on heartbeat_opt
      with refactored LEX_MASTER_INFO::LEX_MI_ENABLE enum.

diff -Nrup a/mysql-test/extra/binlog_tests/binlog.test b/mysql-test/extra/binlog_tests/binlog.test
--- a/mysql-test/extra/binlog_tests/binlog.test	2007-07-10 18:21:02 +02:00
+++ b/mysql-test/extra/binlog_tests/binlog.test	2007-10-13 22:40:56 +02:00
@@ -43,10 +43,10 @@ commit;
 drop table t1;
 --replace_column 2 # 5 #
 --replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//
-show binlog events in 'master-bin.000001' from 106;
+show binlog events in 'master-bin.000001' from 107;
 --replace_column 2 # 5 #
 --replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//
-show binlog events in 'master-bin.000002' from 106;
+show binlog events in 'master-bin.000002' from 107;
 
 
 #
diff -Nrup a/mysql-test/extra/rpl_tests/rpl_deadlock.test b/mysql-test/extra/rpl_tests/rpl_deadlock.test
--- a/mysql-test/extra/rpl_tests/rpl_deadlock.test	2007-06-21 14:39:33 +02:00
+++ b/mysql-test/extra/rpl_tests/rpl_deadlock.test	2007-10-13 22:40:56 +02:00
@@ -82,7 +82,7 @@ show slave status;
 
 stop slave;
 delete from t3;
-change master to master_log_pos=548; # the BEGIN log event
+change master to master_log_pos=549; # the BEGIN log event
 begin;
 select * from t2 for update; # hold lock
 start slave;
@@ -107,7 +107,7 @@ set global max_relay_log_size=0;
 # This is really copy-paste of 2) of above
 stop slave;
 delete from t3;
-change master to master_log_pos=548;
+change master to master_log_pos=549;
 begin;
 select * from t2 for update;
 start slave;
diff -Nrup a/mysql-test/extra/rpl_tests/rpl_loaddata.test b/mysql-test/extra/rpl_tests/rpl_loaddata.test
--- a/mysql-test/extra/rpl_tests/rpl_loaddata.test	2007-07-01 11:55:53 +02:00
+++ b/mysql-test/extra/rpl_tests/rpl_loaddata.test	2007-10-13 22:40:56 +02:00
@@ -79,7 +79,7 @@ start slave;
 sync_with_master;
 --replace_result $MASTER_MYPORT MASTER_PORT
 --replace_column 1 # 8 # 9 # 16 # 23 # 33 #
-show slave status;
+--query_vertical show slave status;
 
 # Trigger error again to test CHANGE MASTER
 
@@ -101,7 +101,7 @@ change master to master_user='test';
 change master to master_user='root';
 --replace_result $MASTER_MYPORT MASTER_PORT
 --replace_column 1 # 8 # 9 # 16 # 23 # 33 #
-show slave status;
+--query_vertical show slave status;
 
 # Trigger error again to test RESET SLAVE
 
@@ -123,7 +123,7 @@ stop slave;
 reset slave;
 --replace_result $MASTER_MYPORT MASTER_PORT
 --replace_column 1 # 8 # 9 # 16 # 23 # 33 #
-show slave status;
+--query_vertical show slave status;
 
 # Finally, see if logging is done ok on master for a failing LOAD DATA INFILE
 
diff -Nrup a/mysql-test/extra/rpl_tests/rpl_log.test b/mysql-test/extra/rpl_tests/rpl_log.test
--- a/mysql-test/extra/rpl_tests/rpl_log.test	2007-07-12 09:19:24 +02:00
+++ b/mysql-test/extra/rpl_tests/rpl_log.test	2007-10-13 22:40:56 +02:00
@@ -41,13 +41,13 @@ select count(*) from t1;
 show binlog events;
 --replace_column 2 # 5 #
 --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
-show binlog events from 106 limit 1;
+show binlog events from 107 limit 1;
 --replace_column 2 # 5 #
 --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
-show binlog events from 106 limit 2;
+show binlog events from 107 limit 2;
 --replace_column 2 # 5 #
 --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
-show binlog events from 106 limit 2,1;
+show binlog events from 107 limit 2,1;
 flush logs;
 
 # We need an extra update before doing save_master_pos.
diff -Nrup a/mysql-test/include/show_binlog_events.inc b/mysql-test/include/show_binlog_events.inc
--- a/mysql-test/include/show_binlog_events.inc	2007-04-18 23:08:53 +02:00
+++ b/mysql-test/include/show_binlog_events.inc	2007-10-13 22:40:56 +02:00
@@ -1,4 +1,4 @@
---let $binlog_start=106
+--let $binlog_start=107
 --replace_result $binlog_start <binlog_start>
 --replace_column 2 # 4 # 5 #
 --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
diff -Nrup a/mysql-test/include/show_binlog_events2.inc b/mysql-test/include/show_binlog_events2.inc
--- a/mysql-test/include/show_binlog_events2.inc	2007-04-18 23:08:53 +02:00
+++ b/mysql-test/include/show_binlog_events2.inc	2007-10-13 22:40:56 +02:00
@@ -2,7 +2,7 @@
 # Differs slightly from show_binlog events in showing server_id
 # which is important for some tests
 #
---let $binlog_start=106
+--let $binlog_start=107
 --replace_result $binlog_start <binlog_start>
 --replace_column 2 # 5 #
 --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
diff -Nrup a/mysql-test/r/ctype_cp932_binlog_stm.result b/mysql-test/r/ctype_cp932_binlog_stm.result
--- a/mysql-test/r/ctype_cp932_binlog_stm.result	2007-08-13 15:11:09 +02:00
+++ b/mysql-test/r/ctype_cp932_binlog_stm.result	2007-10-13 22:40:57 +02:00
@@ -29,21 +29,21 @@ HEX(s1)	HEX(s2)	d
 466F6F2773206120426172	ED40ED41ED42	47.93
 DROP PROCEDURE bug18293|
 DROP TABLE t4|
-SHOW BINLOG EVENTS FROM 369|
+SHOW BINLOG EVENTS FROM 370|
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	369	Query	1	535	use `test`; CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1,
+master-bin.000001	370	Query	1	536	use `test`; CREATE TABLE t4 (s1 CHAR(50) CHARACTER SET latin1,
 s2 CHAR(50) CHARACTER SET cp932,
 d DECIMAL(10,2))
-master-bin.000001	535	Query	1	783	use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE bug18293 (IN ins1 CHAR(50),
+master-bin.000001	536	Query	1	784	use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE bug18293 (IN ins1 CHAR(50),
 IN ins2 CHAR(50) CHARACTER SET cp932,
 IN ind DECIMAL(10,2))
 BEGIN
 INSERT INTO t4 VALUES (ins1, ins2, ind);
 END
-master-bin.000001	783	Query	1	999	use `test`; INSERT INTO t4 VALUES ( NAME_CONST('ins1',_latin1 0x466F6F2773206120426172),  NAME_CONST('ins2',_cp932 0xED40ED41ED42),  NAME_CONST('ind',47.93))
-master-bin.000001	999	Query	1	1088	use `test`; DROP PROCEDURE bug18293
-master-bin.000001	1088	Query	1	1167	use `test`; DROP TABLE t4
+master-bin.000001	784	Query	1	1000	use `test`; INSERT INTO t4 VALUES ( NAME_CONST('ins1',_latin1 0x466F6F2773206120426172),  NAME_CONST('ins2',_cp932 0xED40ED41ED42),  NAME_CONST('ind',47.93))
+master-bin.000001	1000	Query	1	1089	use `test`; DROP PROCEDURE bug18293
+master-bin.000001	1089	Query	1	1168	use `test`; DROP TABLE t4
 End of 5.0 tests
-SHOW BINLOG EVENTS FROM 364;
+SHOW BINLOG EVENTS FROM 365;
 ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Wrong offset or I/O error
 End of 5.1 tests
diff -Nrup a/mysql-test/r/flush_block_commit_notembedded.result b/mysql-test/r/flush_block_commit_notembedded.result
--- a/mysql-test/r/flush_block_commit_notembedded.result	2007-03-30 04:44:43 +02:00
+++ b/mysql-test/r/flush_block_commit_notembedded.result	2007-10-13 22:40:57 +02:00
@@ -5,11 +5,11 @@ insert t1 values (1);
 flush tables with read lock;
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	106		
+master-bin.000001	107		
 commit;
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	106		
+master-bin.000001	107		
 unlock tables;
 drop table t1;
 set autocommit=1;
diff -Nrup a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
--- a/mysql-test/r/innodb.result	2007-08-25 03:14:48 +02:00
+++ b/mysql-test/r/innodb.result	2007-10-13 22:40:57 +02:00
@@ -1107,7 +1107,7 @@ a	b
 4	4
 show master status /* there must no UPDATE in binlog */;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	106		
+master-bin.000001	107		
 delete from t1;
 delete from t2;
 insert into t1 values (1,2),(3,4),(4,4);
@@ -1117,7 +1117,7 @@ UPDATE t2,t1  SET t2.a=t2.b where t2.a=t
 ERROR 23000: Duplicate entry '4' for key 'PRIMARY'
 show master status /* there must be no UPDATE query event */;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	106		
+master-bin.000001	107		
 drop table t1, t2;
 create table t1 (a int, b int) engine=innodb;
 insert into t1 values(20,null);
diff -Nrup a/mysql-test/r/multi_update.result b/mysql-test/r/multi_update.result
--- a/mysql-test/r/multi_update.result	2007-06-21 21:23:19 +02:00
+++ b/mysql-test/r/multi_update.result	2007-10-13 22:40:57 +02:00
@@ -626,7 +626,7 @@ a	b
 4	4
 show master status /* there must be the UPDATE query event */;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	197		
+master-bin.000001	198		
 delete from t1;
 delete from t2;
 insert into t1 values (1,2),(3,4),(4,4);
@@ -636,6 +636,6 @@ UPDATE t2,t1  SET t2.a=t2.b where t2.a=t
 ERROR 23000: Duplicate entry '4' for key 'PRIMARY'
 show master status /* there must be the UPDATE query event */;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	212		
+master-bin.000001	213		
 drop table t1, t2;
 end of tests
diff -Nrup a/mysql-test/r/sp_trans_log.result b/mysql-test/r/sp_trans_log.result
--- a/mysql-test/r/sp_trans_log.result	2007-04-16 19:20:43 +02:00
+++ b/mysql-test/r/sp_trans_log.result	2007-10-13 22:40:57 +02:00
@@ -14,12 +14,12 @@ end|
 reset master|
 insert into t2 values (bug23333(),1)|
 ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
-show binlog events from 106 /* with fixes for #23333 will show there is the query */|
+show binlog events from <binlog_start>|
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Table_map	1	#	#
-master-bin.000001	#	Table_map	1	#	#
-master-bin.000001	#	Write_rows	1	#	#
-master-bin.000001	#	Query	1	#	#
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	use `test`; ROLLBACK
 select count(*),@a from t1 /* must be 1,1 */|
 count(*)	@a
 1	1
diff -Nrup a/mysql-test/suite/binlog/r/binlog_row_binlog.result b/mysql-test/suite/binlog/r/binlog_row_binlog.result
--- a/mysql-test/suite/binlog/r/binlog_row_binlog.result	2007-07-30 13:32:03 +02:00
+++ b/mysql-test/suite/binlog/r/binlog_row_binlog.result	2007-10-13 22:40:57 +02:00
@@ -26,7 +26,7 @@ create table t1 (n int) engine=innodb;
 begin;
 commit;
 drop table t1;
-show binlog events in 'master-bin.000001' from 106;
+show binlog events in 'master-bin.000001' from 107;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	1	#	use `test`; create table t1 (n int) engine=innodb
 master-bin.000001	#	Query	1	#	use `test`; BEGIN
@@ -232,7 +232,7 @@ master-bin.000001	#	Table_map	1	#	table_
 master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	1	#	COMMIT /* xid= */
 master-bin.000001	#	Rotate	1	#	master-bin.000002;pos=4
-show binlog events in 'master-bin.000002' from 106;
+show binlog events in 'master-bin.000002' from 107;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000002	#	Query	1	#	use `test`; drop table t1
 set @ac = @@autocommit;
@@ -247,25 +247,8 @@ commit;
 drop table t1;
 show binlog events from 0;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	4	Format_desc	1	106	Server version, Binlog ver: 4
-master-bin.000001	106	Query	1	205	use `test`; create table t1(n int) engine=innodb
-master-bin.000001	205	Query	1	273	use `test`; BEGIN
-master-bin.000001	273	Table_map	1	314	table_id: # (test.t1)
-master-bin.000001	314	Write_rows	1	348	table_id: # flags: STMT_END_F
-master-bin.000001	348	Table_map	1	389	table_id: # (test.t1)
-master-bin.000001	389	Write_rows	1	423	table_id: # flags: STMT_END_F
-master-bin.000001	423	Table_map	1	464	table_id: # (test.t1)
-master-bin.000001	464	Write_rows	1	498	table_id: # flags: STMT_END_F
-master-bin.000001	498	Xid	1	525	COMMIT /* XID */
-master-bin.000001	525	Query	1	601	use `test`; drop table t1
-set @bcs = @@binlog_cache_size;
-set global binlog_cache_size=4096;
-reset master;
-create table t1 (a int) engine=innodb;
-show binlog events from 0;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	4	Format_desc	1	106	Server version, Binlog ver: 4
-master-bin.000001	106	Query	1	206	use `test`; create table t1 (a int) engine=innodb
+master-bin.000001	4	Format_desc	1	107	Server version, Binlog ver: 4
+master-bin.000001	107	Query	1	206	use `test`; create table t1(n int) engine=innodb
 master-bin.000001	206	Query	1	274	use `test`; BEGIN
 master-bin.000001	274	Table_map	1	315	table_id: # (test.t1)
 master-bin.000001	315	Write_rows	1	349	table_id: # flags: STMT_END_F
@@ -273,802 +256,819 @@ master-bin.000001	349	Table_map	1	390	ta
 master-bin.000001	390	Write_rows	1	424	table_id: # flags: STMT_END_F
 master-bin.000001	424	Table_map	1	465	table_id: # (test.t1)
 master-bin.000001	465	Write_rows	1	499	table_id: # flags: STMT_END_F
-master-bin.000001	499	Table_map	1	540	table_id: # (test.t1)
-master-bin.000001	540	Write_rows	1	574	table_id: # flags: STMT_END_F
-master-bin.000001	574	Table_map	1	615	table_id: # (test.t1)
-master-bin.000001	615	Write_rows	1	649	table_id: # flags: STMT_END_F
-master-bin.000001	649	Table_map	1	690	table_id: # (test.t1)
-master-bin.000001	690	Write_rows	1	724	table_id: # flags: STMT_END_F
-master-bin.000001	724	Table_map	1	765	table_id: # (test.t1)
-master-bin.000001	765	Write_rows	1	799	table_id: # flags: STMT_END_F
-master-bin.000001	799	Table_map	1	840	table_id: # (test.t1)
-master-bin.000001	840	Write_rows	1	874	table_id: # flags: STMT_END_F
-master-bin.000001	874	Table_map	1	915	table_id: # (test.t1)
-master-bin.000001	915	Write_rows	1	949	table_id: # flags: STMT_END_F
-master-bin.000001	949	Table_map	1	990	table_id: # (test.t1)
-master-bin.000001	990	Write_rows	1	1024	table_id: # flags: STMT_END_F
-master-bin.000001	1024	Table_map	1	1065	table_id: # (test.t1)
-master-bin.000001	1065	Write_rows	1	1099	table_id: # flags: STMT_END_F
-master-bin.000001	1099	Table_map	1	1140	table_id: # (test.t1)
-master-bin.000001	1140	Write_rows	1	1174	table_id: # flags: STMT_END_F
-master-bin.000001	1174	Table_map	1	1215	table_id: # (test.t1)
-master-bin.000001	1215	Write_rows	1	1249	table_id: # flags: STMT_END_F
-master-bin.000001	1249	Table_map	1	1290	table_id: # (test.t1)
-master-bin.000001	1290	Write_rows	1	1324	table_id: # flags: STMT_END_F
-master-bin.000001	1324	Table_map	1	1365	table_id: # (test.t1)
-master-bin.000001	1365	Write_rows	1	1399	table_id: # flags: STMT_END_F
-master-bin.000001	1399	Table_map	1	1440	table_id: # (test.t1)
-master-bin.000001	1440	Write_rows	1	1474	table_id: # flags: STMT_END_F
-master-bin.000001	1474	Table_map	1	1515	table_id: # (test.t1)
-master-bin.000001	1515	Write_rows	1	1549	table_id: # flags: STMT_END_F
-master-bin.000001	1549	Table_map	1	1590	table_id: # (test.t1)
-master-bin.000001	1590	Write_rows	1	1624	table_id: # flags: STMT_END_F
-master-bin.000001	1624	Table_map	1	1665	table_id: # (test.t1)
-master-bin.000001	1665	Write_rows	1	1699	table_id: # flags: STMT_END_F
-master-bin.000001	1699	Table_map	1	1740	table_id: # (test.t1)
-master-bin.000001	1740	Write_rows	1	1774	table_id: # flags: STMT_END_F
-master-bin.000001	1774	Table_map	1	1815	table_id: # (test.t1)
-master-bin.000001	1815	Write_rows	1	1849	table_id: # flags: STMT_END_F
-master-bin.000001	1849	Table_map	1	1890	table_id: # (test.t1)
-master-bin.000001	1890	Write_rows	1	1924	table_id: # flags: STMT_END_F
-master-bin.000001	1924	Table_map	1	1965	table_id: # (test.t1)
-master-bin.000001	1965	Write_rows	1	1999	table_id: # flags: STMT_END_F
-master-bin.000001	1999	Table_map	1	2040	table_id: # (test.t1)
-master-bin.000001	2040	Write_rows	1	2074	table_id: # flags: STMT_END_F
-master-bin.000001	2074	Table_map	1	2115	table_id: # (test.t1)
-master-bin.000001	2115	Write_rows	1	2149	table_id: # flags: STMT_END_F
-master-bin.000001	2149	Table_map	1	2190	table_id: # (test.t1)
-master-bin.000001	2190	Write_rows	1	2224	table_id: # flags: STMT_END_F
-master-bin.000001	2224	Table_map	1	2265	table_id: # (test.t1)
-master-bin.000001	2265	Write_rows	1	2299	table_id: # flags: STMT_END_F
-master-bin.000001	2299	Table_map	1	2340	table_id: # (test.t1)
-master-bin.000001	2340	Write_rows	1	2374	table_id: # flags: STMT_END_F
-master-bin.000001	2374	Table_map	1	2415	table_id: # (test.t1)
-master-bin.000001	2415	Write_rows	1	2449	table_id: # flags: STMT_END_F
-master-bin.000001	2449	Table_map	1	2490	table_id: # (test.t1)
-master-bin.000001	2490	Write_rows	1	2524	table_id: # flags: STMT_END_F
-master-bin.000001	2524	Table_map	1	2565	table_id: # (test.t1)
-master-bin.000001	2565	Write_rows	1	2599	table_id: # flags: STMT_END_F
-master-bin.000001	2599	Table_map	1	2640	table_id: # (test.t1)
-master-bin.000001	2640	Write_rows	1	2674	table_id: # flags: STMT_END_F
-master-bin.000001	2674	Table_map	1	2715	table_id: # (test.t1)
-master-bin.000001	2715	Write_rows	1	2749	table_id: # flags: STMT_END_F
-master-bin.000001	2749	Table_map	1	2790	table_id: # (test.t1)
-master-bin.000001	2790	Write_rows	1	2824	table_id: # flags: STMT_END_F
-master-bin.000001	2824	Table_map	1	2865	table_id: # (test.t1)
-master-bin.000001	2865	Write_rows	1	2899	table_id: # flags: STMT_END_F
-master-bin.000001	2899	Table_map	1	2940	table_id: # (test.t1)
-master-bin.000001	2940	Write_rows	1	2974	table_id: # flags: STMT_END_F
-master-bin.000001	2974	Table_map	1	3015	table_id: # (test.t1)
-master-bin.000001	3015	Write_rows	1	3049	table_id: # flags: STMT_END_F
-master-bin.000001	3049	Table_map	1	3090	table_id: # (test.t1)
-master-bin.000001	3090	Write_rows	1	3124	table_id: # flags: STMT_END_F
-master-bin.000001	3124	Table_map	1	3165	table_id: # (test.t1)
-master-bin.000001	3165	Write_rows	1	3199	table_id: # flags: STMT_END_F
-master-bin.000001	3199	Table_map	1	3240	table_id: # (test.t1)
-master-bin.000001	3240	Write_rows	1	3274	table_id: # flags: STMT_END_F
-master-bin.000001	3274	Table_map	1	3315	table_id: # (test.t1)
-master-bin.000001	3315	Write_rows	1	3349	table_id: # flags: STMT_END_F
-master-bin.000001	3349	Table_map	1	3390	table_id: # (test.t1)
-master-bin.000001	3390	Write_rows	1	3424	table_id: # flags: STMT_END_F
-master-bin.000001	3424	Table_map	1	3465	table_id: # (test.t1)
-master-bin.000001	3465	Write_rows	1	3499	table_id: # flags: STMT_END_F
-master-bin.000001	3499	Table_map	1	3540	table_id: # (test.t1)
-master-bin.000001	3540	Write_rows	1	3574	table_id: # flags: STMT_END_F
-master-bin.000001	3574	Table_map	1	3615	table_id: # (test.t1)
-master-bin.000001	3615	Write_rows	1	3649	table_id: # flags: STMT_END_F
-master-bin.000001	3649	Table_map	1	3690	table_id: # (test.t1)
-master-bin.000001	3690	Write_rows	1	3724	table_id: # flags: STMT_END_F
-master-bin.000001	3724	Table_map	1	3765	table_id: # (test.t1)
-master-bin.000001	3765	Write_rows	1	3799	table_id: # flags: STMT_END_F
-master-bin.000001	3799	Table_map	1	3840	table_id: # (test.t1)
-master-bin.000001	3840	Write_rows	1	3874	table_id: # flags: STMT_END_F
-master-bin.000001	3874	Table_map	1	3915	table_id: # (test.t1)
-master-bin.000001	3915	Write_rows	1	3949	table_id: # flags: STMT_END_F
-master-bin.000001	3949	Table_map	1	3990	table_id: # (test.t1)
-master-bin.000001	3990	Write_rows	1	4024	table_id: # flags: STMT_END_F
-master-bin.000001	4024	Table_map	1	4065	table_id: # (test.t1)
-master-bin.000001	4065	Write_rows	1	4099	table_id: # flags: STMT_END_F
-master-bin.000001	4099	Table_map	1	4140	table_id: # (test.t1)
-master-bin.000001	4140	Write_rows	1	4174	table_id: # flags: STMT_END_F
-master-bin.000001	4174	Table_map	1	4215	table_id: # (test.t1)
-master-bin.000001	4215	Write_rows	1	4249	table_id: # flags: STMT_END_F
-master-bin.000001	4249	Table_map	1	4290	table_id: # (test.t1)
-master-bin.000001	4290	Write_rows	1	4324	table_id: # flags: STMT_END_F
-master-bin.000001	4324	Table_map	1	4365	table_id: # (test.t1)
-master-bin.000001	4365	Write_rows	1	4399	table_id: # flags: STMT_END_F
-master-bin.000001	4399	Table_map	1	4440	table_id: # (test.t1)
-master-bin.000001	4440	Write_rows	1	4474	table_id: # flags: STMT_END_F
-master-bin.000001	4474	Table_map	1	4515	table_id: # (test.t1)
-master-bin.000001	4515	Write_rows	1	4549	table_id: # flags: STMT_END_F
-master-bin.000001	4549	Table_map	1	4590	table_id: # (test.t1)
-master-bin.000001	4590	Write_rows	1	4624	table_id: # flags: STMT_END_F
-master-bin.000001	4624	Table_map	1	4665	table_id: # (test.t1)
-master-bin.000001	4665	Write_rows	1	4699	table_id: # flags: STMT_END_F
-master-bin.000001	4699	Table_map	1	4740	table_id: # (test.t1)
-master-bin.000001	4740	Write_rows	1	4774	table_id: # flags: STMT_END_F
-master-bin.000001	4774	Table_map	1	4815	table_id: # (test.t1)
-master-bin.000001	4815	Write_rows	1	4849	table_id: # flags: STMT_END_F
-master-bin.000001	4849	Table_map	1	4890	table_id: # (test.t1)
-master-bin.000001	4890	Write_rows	1	4924	table_id: # flags: STMT_END_F
-master-bin.000001	4924	Table_map	1	4965	table_id: # (test.t1)
-master-bin.000001	4965	Write_rows	1	4999	table_id: # flags: STMT_END_F
-master-bin.000001	4999	Table_map	1	5040	table_id: # (test.t1)
-master-bin.000001	5040	Write_rows	1	5074	table_id: # flags: STMT_END_F
-master-bin.000001	5074	Table_map	1	5115	table_id: # (test.t1)
-master-bin.000001	5115	Write_rows	1	5149	table_id: # flags: STMT_END_F
-master-bin.000001	5149	Table_map	1	5190	table_id: # (test.t1)
-master-bin.000001	5190	Write_rows	1	5224	table_id: # flags: STMT_END_F
-master-bin.000001	5224	Table_map	1	5265	table_id: # (test.t1)
-master-bin.000001	5265	Write_rows	1	5299	table_id: # flags: STMT_END_F
-master-bin.000001	5299	Table_map	1	5340	table_id: # (test.t1)
-master-bin.000001	5340	Write_rows	1	5374	table_id: # flags: STMT_END_F
-master-bin.000001	5374	Table_map	1	5415	table_id: # (test.t1)
-master-bin.000001	5415	Write_rows	1	5449	table_id: # flags: STMT_END_F
-master-bin.000001	5449	Table_map	1	5490	table_id: # (test.t1)
-master-bin.000001	5490	Write_rows	1	5524	table_id: # flags: STMT_END_F
-master-bin.000001	5524	Table_map	1	5565	table_id: # (test.t1)
-master-bin.000001	5565	Write_rows	1	5599	table_id: # flags: STMT_END_F
-master-bin.000001	5599	Table_map	1	5640	table_id: # (test.t1)
-master-bin.000001	5640	Write_rows	1	5674	table_id: # flags: STMT_END_F
-master-bin.000001	5674	Table_map	1	5715	table_id: # (test.t1)
-master-bin.000001	5715	Write_rows	1	5749	table_id: # flags: STMT_END_F
-master-bin.000001	5749	Table_map	1	5790	table_id: # (test.t1)
-master-bin.000001	5790	Write_rows	1	5824	table_id: # flags: STMT_END_F
-master-bin.000001	5824	Table_map	1	5865	table_id: # (test.t1)
-master-bin.000001	5865	Write_rows	1	5899	table_id: # flags: STMT_END_F
-master-bin.000001	5899	Table_map	1	5940	table_id: # (test.t1)
-master-bin.000001	5940	Write_rows	1	5974	table_id: # flags: STMT_END_F
-master-bin.000001	5974	Table_map	1	6015	table_id: # (test.t1)
-master-bin.000001	6015	Write_rows	1	6049	table_id: # flags: STMT_END_F
-master-bin.000001	6049	Table_map	1	6090	table_id: # (test.t1)
-master-bin.000001	6090	Write_rows	1	6124	table_id: # flags: STMT_END_F
-master-bin.000001	6124	Table_map	1	6165	table_id: # (test.t1)
-master-bin.000001	6165	Write_rows	1	6199	table_id: # flags: STMT_END_F
-master-bin.000001	6199	Table_map	1	6240	table_id: # (test.t1)
-master-bin.000001	6240	Write_rows	1	6274	table_id: # flags: STMT_END_F
-master-bin.000001	6274	Table_map	1	6315	table_id: # (test.t1)
-master-bin.000001	6315	Write_rows	1	6349	table_id: # flags: STMT_END_F
-master-bin.000001	6349	Table_map	1	6390	table_id: # (test.t1)
-master-bin.000001	6390	Write_rows	1	6424	table_id: # flags: STMT_END_F
-master-bin.000001	6424	Table_map	1	6465	table_id: # (test.t1)
-master-bin.000001	6465	Write_rows	1	6499	table_id: # flags: STMT_END_F
-master-bin.000001	6499	Table_map	1	6540	table_id: # (test.t1)
-master-bin.000001	6540	Write_rows	1	6574	table_id: # flags: STMT_END_F
-master-bin.000001	6574	Table_map	1	6615	table_id: # (test.t1)
-master-bin.000001	6615	Write_rows	1	6649	table_id: # flags: STMT_END_F
-master-bin.000001	6649	Table_map	1	6690	table_id: # (test.t1)
-master-bin.000001	6690	Write_rows	1	6724	table_id: # flags: STMT_END_F
-master-bin.000001	6724	Table_map	1	6765	table_id: # (test.t1)
-master-bin.000001	6765	Write_rows	1	6799	table_id: # flags: STMT_END_F
-master-bin.000001	6799	Table_map	1	6840	table_id: # (test.t1)
-master-bin.000001	6840	Write_rows	1	6874	table_id: # flags: STMT_END_F
-master-bin.000001	6874	Table_map	1	6915	table_id: # (test.t1)
-master-bin.000001	6915	Write_rows	1	6949	table_id: # flags: STMT_END_F
-master-bin.000001	6949	Table_map	1	6990	table_id: # (test.t1)
-master-bin.000001	6990	Write_rows	1	7024	table_id: # flags: STMT_END_F
-master-bin.000001	7024	Table_map	1	7065	table_id: # (test.t1)
-master-bin.000001	7065	Write_rows	1	7099	table_id: # flags: STMT_END_F
-master-bin.000001	7099	Table_map	1	7140	table_id: # (test.t1)
-master-bin.000001	7140	Write_rows	1	7174	table_id: # flags: STMT_END_F
-master-bin.000001	7174	Table_map	1	7215	table_id: # (test.t1)
-master-bin.000001	7215	Write_rows	1	7249	table_id: # flags: STMT_END_F
-master-bin.000001	7249	Table_map	1	7290	table_id: # (test.t1)
-master-bin.000001	7290	Write_rows	1	7324	table_id: # flags: STMT_END_F
-master-bin.000001	7324	Table_map	1	7365	table_id: # (test.t1)
-master-bin.000001	7365	Write_rows	1	7399	table_id: # flags: STMT_END_F
-master-bin.000001	7399	Table_map	1	7440	table_id: # (test.t1)
-master-bin.000001	7440	Write_rows	1	7474	table_id: # flags: STMT_END_F
-master-bin.000001	7474	Table_map	1	7515	table_id: # (test.t1)
-master-bin.000001	7515	Write_rows	1	7549	table_id: # flags: STMT_END_F
-master-bin.000001	7549	Table_map	1	7590	table_id: # (test.t1)
-master-bin.000001	7590	Write_rows	1	7624	table_id: # flags: STMT_END_F
-master-bin.000001	7624	Table_map	1	7665	table_id: # (test.t1)
-master-bin.000001	7665	Write_rows	1	7699	table_id: # flags: STMT_END_F
-master-bin.000001	7699	Table_map	1	7740	table_id: # (test.t1)
-master-bin.000001	7740	Write_rows	1	7774	table_id: # flags: STMT_END_F
-master-bin.000001	7774	Table_map	1	7815	table_id: # (test.t1)
-master-bin.000001	7815	Write_rows	1	7849	table_id: # flags: STMT_END_F
-master-bin.000001	7849	Table_map	1	7890	table_id: # (test.t1)
-master-bin.000001	7890	Write_rows	1	7924	table_id: # flags: STMT_END_F
-master-bin.000001	7924	Table_map	1	7965	table_id: # (test.t1)
-master-bin.000001	7965	Write_rows	1	7999	table_id: # flags: STMT_END_F
-master-bin.000001	7999	Table_map	1	8040	table_id: # (test.t1)
-master-bin.000001	8040	Write_rows	1	8074	table_id: # flags: STMT_END_F
-master-bin.000001	8074	Table_map	1	8115	table_id: # (test.t1)
-master-bin.000001	8115	Write_rows	1	8149	table_id: # flags: STMT_END_F
-master-bin.000001	8149	Table_map	1	8190	table_id: # (test.t1)
-master-bin.000001	8190	Write_rows	1	8224	table_id: # flags: STMT_END_F
-master-bin.000001	8224	Table_map	1	8265	table_id: # (test.t1)
-master-bin.000001	8265	Write_rows	1	8299	table_id: # flags: STMT_END_F
-master-bin.000001	8299	Table_map	1	8340	table_id: # (test.t1)
-master-bin.000001	8340	Write_rows	1	8374	table_id: # flags: STMT_END_F
-master-bin.000001	8374	Table_map	1	8415	table_id: # (test.t1)
-master-bin.000001	8415	Write_rows	1	8449	table_id: # flags: STMT_END_F
-master-bin.000001	8449	Table_map	1	8490	table_id: # (test.t1)
-master-bin.000001	8490	Write_rows	1	8524	table_id: # flags: STMT_END_F
-master-bin.000001	8524	Table_map	1	8565	table_id: # (test.t1)
-master-bin.000001	8565	Write_rows	1	8599	table_id: # flags: STMT_END_F
-master-bin.000001	8599	Table_map	1	8640	table_id: # (test.t1)
-master-bin.000001	8640	Write_rows	1	8674	table_id: # flags: STMT_END_F
-master-bin.000001	8674	Table_map	1	8715	table_id: # (test.t1)
-master-bin.000001	8715	Write_rows	1	8749	table_id: # flags: STMT_END_F
-master-bin.000001	8749	Table_map	1	8790	table_id: # (test.t1)
-master-bin.000001	8790	Write_rows	1	8824	table_id: # flags: STMT_END_F
-master-bin.000001	8824	Table_map	1	8865	table_id: # (test.t1)
-master-bin.000001	8865	Write_rows	1	8899	table_id: # flags: STMT_END_F
-master-bin.000001	8899	Table_map	1	8940	table_id: # (test.t1)
-master-bin.000001	8940	Write_rows	1	8974	table_id: # flags: STMT_END_F
-master-bin.000001	8974	Table_map	1	9015	table_id: # (test.t1)
-master-bin.000001	9015	Write_rows	1	9049	table_id: # flags: STMT_END_F
-master-bin.000001	9049	Table_map	1	9090	table_id: # (test.t1)
-master-bin.000001	9090	Write_rows	1	9124	table_id: # flags: STMT_END_F
-master-bin.000001	9124	Table_map	1	9165	table_id: # (test.t1)
-master-bin.000001	9165	Write_rows	1	9199	table_id: # flags: STMT_END_F
-master-bin.000001	9199	Table_map	1	9240	table_id: # (test.t1)
-master-bin.000001	9240	Write_rows	1	9274	table_id: # flags: STMT_END_F
-master-bin.000001	9274	Table_map	1	9315	table_id: # (test.t1)
-master-bin.000001	9315	Write_rows	1	9349	table_id: # flags: STMT_END_F
-master-bin.000001	9349	Table_map	1	9390	table_id: # (test.t1)
-master-bin.000001	9390	Write_rows	1	9424	table_id: # flags: STMT_END_F
-master-bin.000001	9424	Table_map	1	9465	table_id: # (test.t1)
-master-bin.000001	9465	Write_rows	1	9499	table_id: # flags: STMT_END_F
-master-bin.000001	9499	Table_map	1	9540	table_id: # (test.t1)
-master-bin.000001	9540	Write_rows	1	9574	table_id: # flags: STMT_END_F
-master-bin.000001	9574	Table_map	1	9615	table_id: # (test.t1)
-master-bin.000001	9615	Write_rows	1	9649	table_id: # flags: STMT_END_F
-master-bin.000001	9649	Table_map	1	9690	table_id: # (test.t1)
-master-bin.000001	9690	Write_rows	1	9724	table_id: # flags: STMT_END_F
-master-bin.000001	9724	Table_map	1	9765	table_id: # (test.t1)
-master-bin.000001	9765	Write_rows	1	9799	table_id: # flags: STMT_END_F
-master-bin.000001	9799	Table_map	1	9840	table_id: # (test.t1)
-master-bin.000001	9840	Write_rows	1	9874	table_id: # flags: STMT_END_F
-master-bin.000001	9874	Table_map	1	9915	table_id: # (test.t1)
-master-bin.000001	9915	Write_rows	1	9949	table_id: # flags: STMT_END_F
-master-bin.000001	9949	Table_map	1	9990	table_id: # (test.t1)
-master-bin.000001	9990	Write_rows	1	10024	table_id: # flags: STMT_END_F
-master-bin.000001	10024	Table_map	1	10065	table_id: # (test.t1)
-master-bin.000001	10065	Write_rows	1	10099	table_id: # flags: STMT_END_F
-master-bin.000001	10099	Table_map	1	10140	table_id: # (test.t1)
-master-bin.000001	10140	Write_rows	1	10174	table_id: # flags: STMT_END_F
-master-bin.000001	10174	Table_map	1	10215	table_id: # (test.t1)
-master-bin.000001	10215	Write_rows	1	10249	table_id: # flags: STMT_END_F
-master-bin.000001	10249	Table_map	1	10290	table_id: # (test.t1)
-master-bin.000001	10290	Write_rows	1	10324	table_id: # flags: STMT_END_F
-master-bin.000001	10324	Table_map	1	10365	table_id: # (test.t1)
-master-bin.000001	10365	Write_rows	1	10399	table_id: # flags: STMT_END_F
-master-bin.000001	10399	Table_map	1	10440	table_id: # (test.t1)
-master-bin.000001	10440	Write_rows	1	10474	table_id: # flags: STMT_END_F
-master-bin.000001	10474	Table_map	1	10515	table_id: # (test.t1)
-master-bin.000001	10515	Write_rows	1	10549	table_id: # flags: STMT_END_F
-master-bin.000001	10549	Table_map	1	10590	table_id: # (test.t1)
-master-bin.000001	10590	Write_rows	1	10624	table_id: # flags: STMT_END_F
-master-bin.000001	10624	Table_map	1	10665	table_id: # (test.t1)
-master-bin.000001	10665	Write_rows	1	10699	table_id: # flags: STMT_END_F
-master-bin.000001	10699	Table_map	1	10740	table_id: # (test.t1)
-master-bin.000001	10740	Write_rows	1	10774	table_id: # flags: STMT_END_F
-master-bin.000001	10774	Table_map	1	10815	table_id: # (test.t1)
-master-bin.000001	10815	Write_rows	1	10849	table_id: # flags: STMT_END_F
-master-bin.000001	10849	Table_map	1	10890	table_id: # (test.t1)
-master-bin.000001	10890	Write_rows	1	10924	table_id: # flags: STMT_END_F
-master-bin.000001	10924	Table_map	1	10965	table_id: # (test.t1)
-master-bin.000001	10965	Write_rows	1	10999	table_id: # flags: STMT_END_F
-master-bin.000001	10999	Table_map	1	11040	table_id: # (test.t1)
-master-bin.000001	11040	Write_rows	1	11074	table_id: # flags: STMT_END_F
-master-bin.000001	11074	Table_map	1	11115	table_id: # (test.t1)
-master-bin.000001	11115	Write_rows	1	11149	table_id: # flags: STMT_END_F
-master-bin.000001	11149	Table_map	1	11190	table_id: # (test.t1)
-master-bin.000001	11190	Write_rows	1	11224	table_id: # flags: STMT_END_F
-master-bin.000001	11224	Table_map	1	11265	table_id: # (test.t1)
-master-bin.000001	11265	Write_rows	1	11299	table_id: # flags: STMT_END_F
-master-bin.000001	11299	Table_map	1	11340	table_id: # (test.t1)
-master-bin.000001	11340	Write_rows	1	11374	table_id: # flags: STMT_END_F
-master-bin.000001	11374	Table_map	1	11415	table_id: # (test.t1)
-master-bin.000001	11415	Write_rows	1	11449	table_id: # flags: STMT_END_F
-master-bin.000001	11449	Table_map	1	11490	table_id: # (test.t1)
-master-bin.000001	11490	Write_rows	1	11524	table_id: # flags: STMT_END_F
-master-bin.000001	11524	Table_map	1	11565	table_id: # (test.t1)
-master-bin.000001	11565	Write_rows	1	11599	table_id: # flags: STMT_END_F
-master-bin.000001	11599	Table_map	1	11640	table_id: # (test.t1)
-master-bin.000001	11640	Write_rows	1	11674	table_id: # flags: STMT_END_F
-master-bin.000001	11674	Table_map	1	11715	table_id: # (test.t1)
-master-bin.000001	11715	Write_rows	1	11749	table_id: # flags: STMT_END_F
-master-bin.000001	11749	Table_map	1	11790	table_id: # (test.t1)
-master-bin.000001	11790	Write_rows	1	11824	table_id: # flags: STMT_END_F
-master-bin.000001	11824	Table_map	1	11865	table_id: # (test.t1)
-master-bin.000001	11865	Write_rows	1	11899	table_id: # flags: STMT_END_F
-master-bin.000001	11899	Table_map	1	11940	table_id: # (test.t1)
-master-bin.000001	11940	Write_rows	1	11974	table_id: # flags: STMT_END_F
-master-bin.000001	11974	Table_map	1	12015	table_id: # (test.t1)
-master-bin.000001	12015	Write_rows	1	12049	table_id: # flags: STMT_END_F
-master-bin.000001	12049	Table_map	1	12090	table_id: # (test.t1)
-master-bin.000001	12090	Write_rows	1	12124	table_id: # flags: STMT_END_F
-master-bin.000001	12124	Table_map	1	12165	table_id: # (test.t1)
-master-bin.000001	12165	Write_rows	1	12199	table_id: # flags: STMT_END_F
-master-bin.000001	12199	Table_map	1	12240	table_id: # (test.t1)
-master-bin.000001	12240	Write_rows	1	12274	table_id: # flags: STMT_END_F
-master-bin.000001	12274	Table_map	1	12315	table_id: # (test.t1)
-master-bin.000001	12315	Write_rows	1	12349	table_id: # flags: STMT_END_F
-master-bin.000001	12349	Table_map	1	12390	table_id: # (test.t1)
-master-bin.000001	12390	Write_rows	1	12424	table_id: # flags: STMT_END_F
-master-bin.000001	12424	Table_map	1	12465	table_id: # (test.t1)
-master-bin.000001	12465	Write_rows	1	12499	table_id: # flags: STMT_END_F
-master-bin.000001	12499	Table_map	1	12540	table_id: # (test.t1)
-master-bin.000001	12540	Write_rows	1	12574	table_id: # flags: STMT_END_F
-master-bin.000001	12574	Table_map	1	12615	table_id: # (test.t1)
-master-bin.000001	12615	Write_rows	1	12649	table_id: # flags: STMT_END_F
-master-bin.000001	12649	Table_map	1	12690	table_id: # (test.t1)
-master-bin.000001	12690	Write_rows	1	12724	table_id: # flags: STMT_END_F
-master-bin.000001	12724	Table_map	1	12765	table_id: # (test.t1)
-master-bin.000001	12765	Write_rows	1	12799	table_id: # flags: STMT_END_F
-master-bin.000001	12799	Table_map	1	12840	table_id: # (test.t1)
-master-bin.000001	12840	Write_rows	1	12874	table_id: # flags: STMT_END_F
-master-bin.000001	12874	Table_map	1	12915	table_id: # (test.t1)
-master-bin.000001	12915	Write_rows	1	12949	table_id: # flags: STMT_END_F
-master-bin.000001	12949	Table_map	1	12990	table_id: # (test.t1)
-master-bin.000001	12990	Write_rows	1	13024	table_id: # flags: STMT_END_F
-master-bin.000001	13024	Table_map	1	13065	table_id: # (test.t1)
-master-bin.000001	13065	Write_rows	1	13099	table_id: # flags: STMT_END_F
-master-bin.000001	13099	Table_map	1	13140	table_id: # (test.t1)
-master-bin.000001	13140	Write_rows	1	13174	table_id: # flags: STMT_END_F
-master-bin.000001	13174	Table_map	1	13215	table_id: # (test.t1)
-master-bin.000001	13215	Write_rows	1	13249	table_id: # flags: STMT_END_F
-master-bin.000001	13249	Table_map	1	13290	table_id: # (test.t1)
-master-bin.000001	13290	Write_rows	1	13324	table_id: # flags: STMT_END_F
-master-bin.000001	13324	Table_map	1	13365	table_id: # (test.t1)
-master-bin.000001	13365	Write_rows	1	13399	table_id: # flags: STMT_END_F
-master-bin.000001	13399	Table_map	1	13440	table_id: # (test.t1)
-master-bin.000001	13440	Write_rows	1	13474	table_id: # flags: STMT_END_F
-master-bin.000001	13474	Table_map	1	13515	table_id: # (test.t1)
-master-bin.000001	13515	Write_rows	1	13549	table_id: # flags: STMT_END_F
-master-bin.000001	13549	Table_map	1	13590	table_id: # (test.t1)
-master-bin.000001	13590	Write_rows	1	13624	table_id: # flags: STMT_END_F
-master-bin.000001	13624	Table_map	1	13665	table_id: # (test.t1)
-master-bin.000001	13665	Write_rows	1	13699	table_id: # flags: STMT_END_F
-master-bin.000001	13699	Table_map	1	13740	table_id: # (test.t1)
-master-bin.000001	13740	Write_rows	1	13774	table_id: # flags: STMT_END_F
-master-bin.000001	13774	Table_map	1	13815	table_id: # (test.t1)
-master-bin.000001	13815	Write_rows	1	13849	table_id: # flags: STMT_END_F
-master-bin.000001	13849	Table_map	1	13890	table_id: # (test.t1)
-master-bin.000001	13890	Write_rows	1	13924	table_id: # flags: STMT_END_F
-master-bin.000001	13924	Table_map	1	13965	table_id: # (test.t1)
-master-bin.000001	13965	Write_rows	1	13999	table_id: # flags: STMT_END_F
-master-bin.000001	13999	Table_map	1	14040	table_id: # (test.t1)
-master-bin.000001	14040	Write_rows	1	14074	table_id: # flags: STMT_END_F
-master-bin.000001	14074	Table_map	1	14115	table_id: # (test.t1)
-master-bin.000001	14115	Write_rows	1	14149	table_id: # flags: STMT_END_F
-master-bin.000001	14149	Table_map	1	14190	table_id: # (test.t1)
-master-bin.000001	14190	Write_rows	1	14224	table_id: # flags: STMT_END_F
-master-bin.000001	14224	Table_map	1	14265	table_id: # (test.t1)
-master-bin.000001	14265	Write_rows	1	14299	table_id: # flags: STMT_END_F
-master-bin.000001	14299	Table_map	1	14340	table_id: # (test.t1)
-master-bin.000001	14340	Write_rows	1	14374	table_id: # flags: STMT_END_F
-master-bin.000001	14374	Table_map	1	14415	table_id: # (test.t1)
-master-bin.000001	14415	Write_rows	1	14449	table_id: # flags: STMT_END_F
-master-bin.000001	14449	Table_map	1	14490	table_id: # (test.t1)
-master-bin.000001	14490	Write_rows	1	14524	table_id: # flags: STMT_END_F
-master-bin.000001	14524	Table_map	1	14565	table_id: # (test.t1)
-master-bin.000001	14565	Write_rows	1	14599	table_id: # flags: STMT_END_F
-master-bin.000001	14599	Table_map	1	14640	table_id: # (test.t1)
-master-bin.000001	14640	Write_rows	1	14674	table_id: # flags: STMT_END_F
-master-bin.000001	14674	Table_map	1	14715	table_id: # (test.t1)
-master-bin.000001	14715	Write_rows	1	14749	table_id: # flags: STMT_END_F
-master-bin.000001	14749	Table_map	1	14790	table_id: # (test.t1)
-master-bin.000001	14790	Write_rows	1	14824	table_id: # flags: STMT_END_F
-master-bin.000001	14824	Table_map	1	14865	table_id: # (test.t1)
-master-bin.000001	14865	Write_rows	1	14899	table_id: # flags: STMT_END_F
-master-bin.000001	14899	Table_map	1	14940	table_id: # (test.t1)
-master-bin.000001	14940	Write_rows	1	14974	table_id: # flags: STMT_END_F
-master-bin.000001	14974	Table_map	1	15015	table_id: # (test.t1)
-master-bin.000001	15015	Write_rows	1	15049	table_id: # flags: STMT_END_F
-master-bin.000001	15049	Table_map	1	15090	table_id: # (test.t1)
-master-bin.000001	15090	Write_rows	1	15124	table_id: # flags: STMT_END_F
-master-bin.000001	15124	Table_map	1	15165	table_id: # (test.t1)
-master-bin.000001	15165	Write_rows	1	15199	table_id: # flags: STMT_END_F
-master-bin.000001	15199	Table_map	1	15240	table_id: # (test.t1)
-master-bin.000001	15240	Write_rows	1	15274	table_id: # flags: STMT_END_F
-master-bin.000001	15274	Table_map	1	15315	table_id: # (test.t1)
-master-bin.000001	15315	Write_rows	1	15349	table_id: # flags: STMT_END_F
-master-bin.000001	15349	Table_map	1	15390	table_id: # (test.t1)
-master-bin.000001	15390	Write_rows	1	15424	table_id: # flags: STMT_END_F
-master-bin.000001	15424	Table_map	1	15465	table_id: # (test.t1)
-master-bin.000001	15465	Write_rows	1	15499	table_id: # flags: STMT_END_F
-master-bin.000001	15499	Table_map	1	15540	table_id: # (test.t1)
-master-bin.000001	15540	Write_rows	1	15574	table_id: # flags: STMT_END_F
-master-bin.000001	15574	Table_map	1	15615	table_id: # (test.t1)
-master-bin.000001	15615	Write_rows	1	15649	table_id: # flags: STMT_END_F
-master-bin.000001	15649	Table_map	1	15690	table_id: # (test.t1)
-master-bin.000001	15690	Write_rows	1	15724	table_id: # flags: STMT_END_F
-master-bin.000001	15724	Table_map	1	15765	table_id: # (test.t1)
-master-bin.000001	15765	Write_rows	1	15799	table_id: # flags: STMT_END_F
-master-bin.000001	15799	Table_map	1	15840	table_id: # (test.t1)
-master-bin.000001	15840	Write_rows	1	15874	table_id: # flags: STMT_END_F
-master-bin.000001	15874	Table_map	1	15915	table_id: # (test.t1)
-master-bin.000001	15915	Write_rows	1	15949	table_id: # flags: STMT_END_F
-master-bin.000001	15949	Table_map	1	15990	table_id: # (test.t1)
-master-bin.000001	15990	Write_rows	1	16024	table_id: # flags: STMT_END_F
-master-bin.000001	16024	Table_map	1	16065	table_id: # (test.t1)
-master-bin.000001	16065	Write_rows	1	16099	table_id: # flags: STMT_END_F
-master-bin.000001	16099	Table_map	1	16140	table_id: # (test.t1)
-master-bin.000001	16140	Write_rows	1	16174	table_id: # flags: STMT_END_F
-master-bin.000001	16174	Table_map	1	16215	table_id: # (test.t1)
-master-bin.000001	16215	Write_rows	1	16249	table_id: # flags: STMT_END_F
-master-bin.000001	16249	Table_map	1	16290	table_id: # (test.t1)
-master-bin.000001	16290	Write_rows	1	16324	table_id: # flags: STMT_END_F
-master-bin.000001	16324	Table_map	1	16365	table_id: # (test.t1)
-master-bin.000001	16365	Write_rows	1	16399	table_id: # flags: STMT_END_F
-master-bin.000001	16399	Table_map	1	16440	table_id: # (test.t1)
-master-bin.000001	16440	Write_rows	1	16474	table_id: # flags: STMT_END_F
-master-bin.000001	16474	Table_map	1	16515	table_id: # (test.t1)
-master-bin.000001	16515	Write_rows	1	16549	table_id: # flags: STMT_END_F
-master-bin.000001	16549	Table_map	1	16590	table_id: # (test.t1)
-master-bin.000001	16590	Write_rows	1	16624	table_id: # flags: STMT_END_F
-master-bin.000001	16624	Table_map	1	16665	table_id: # (test.t1)
-master-bin.000001	16665	Write_rows	1	16699	table_id: # flags: STMT_END_F
-master-bin.000001	16699	Table_map	1	16740	table_id: # (test.t1)
-master-bin.000001	16740	Write_rows	1	16774	table_id: # flags: STMT_END_F
-master-bin.000001	16774	Table_map	1	16815	table_id: # (test.t1)
-master-bin.000001	16815	Write_rows	1	16849	table_id: # flags: STMT_END_F
-master-bin.000001	16849	Table_map	1	16890	table_id: # (test.t1)
-master-bin.000001	16890	Write_rows	1	16924	table_id: # flags: STMT_END_F
-master-bin.000001	16924	Table_map	1	16965	table_id: # (test.t1)
-master-bin.000001	16965	Write_rows	1	16999	table_id: # flags: STMT_END_F
-master-bin.000001	16999	Table_map	1	17040	table_id: # (test.t1)
-master-bin.000001	17040	Write_rows	1	17074	table_id: # flags: STMT_END_F
-master-bin.000001	17074	Table_map	1	17115	table_id: # (test.t1)
-master-bin.000001	17115	Write_rows	1	17149	table_id: # flags: STMT_END_F
-master-bin.000001	17149	Table_map	1	17190	table_id: # (test.t1)
-master-bin.000001	17190	Write_rows	1	17224	table_id: # flags: STMT_END_F
-master-bin.000001	17224	Table_map	1	17265	table_id: # (test.t1)
-master-bin.000001	17265	Write_rows	1	17299	table_id: # flags: STMT_END_F
-master-bin.000001	17299	Table_map	1	17340	table_id: # (test.t1)
-master-bin.000001	17340	Write_rows	1	17374	table_id: # flags: STMT_END_F
-master-bin.000001	17374	Table_map	1	17415	table_id: # (test.t1)
-master-bin.000001	17415	Write_rows	1	17449	table_id: # flags: STMT_END_F
-master-bin.000001	17449	Table_map	1	17490	table_id: # (test.t1)
-master-bin.000001	17490	Write_rows	1	17524	table_id: # flags: STMT_END_F
-master-bin.000001	17524	Table_map	1	17565	table_id: # (test.t1)
-master-bin.000001	17565	Write_rows	1	17599	table_id: # flags: STMT_END_F
-master-bin.000001	17599	Table_map	1	17640	table_id: # (test.t1)
-master-bin.000001	17640	Write_rows	1	17674	table_id: # flags: STMT_END_F
-master-bin.000001	17674	Table_map	1	17715	table_id: # (test.t1)
-master-bin.000001	17715	Write_rows	1	17749	table_id: # flags: STMT_END_F
-master-bin.000001	17749	Table_map	1	17790	table_id: # (test.t1)
-master-bin.000001	17790	Write_rows	1	17824	table_id: # flags: STMT_END_F
-master-bin.000001	17824	Table_map	1	17865	table_id: # (test.t1)
-master-bin.000001	17865	Write_rows	1	17899	table_id: # flags: STMT_END_F
-master-bin.000001	17899	Table_map	1	17940	table_id: # (test.t1)
-master-bin.000001	17940	Write_rows	1	17974	table_id: # flags: STMT_END_F
-master-bin.000001	17974	Table_map	1	18015	table_id: # (test.t1)
-master-bin.000001	18015	Write_rows	1	18049	table_id: # flags: STMT_END_F
-master-bin.000001	18049	Table_map	1	18090	table_id: # (test.t1)
-master-bin.000001	18090	Write_rows	1	18124	table_id: # flags: STMT_END_F
-master-bin.000001	18124	Table_map	1	18165	table_id: # (test.t1)
-master-bin.000001	18165	Write_rows	1	18199	table_id: # flags: STMT_END_F
-master-bin.000001	18199	Table_map	1	18240	table_id: # (test.t1)
-master-bin.000001	18240	Write_rows	1	18274	table_id: # flags: STMT_END_F
-master-bin.000001	18274	Table_map	1	18315	table_id: # (test.t1)
-master-bin.000001	18315	Write_rows	1	18349	table_id: # flags: STMT_END_F
-master-bin.000001	18349	Table_map	1	18390	table_id: # (test.t1)
-master-bin.000001	18390	Write_rows	1	18424	table_id: # flags: STMT_END_F
-master-bin.000001	18424	Table_map	1	18465	table_id: # (test.t1)
-master-bin.000001	18465	Write_rows	1	18499	table_id: # flags: STMT_END_F
-master-bin.000001	18499	Table_map	1	18540	table_id: # (test.t1)
-master-bin.000001	18540	Write_rows	1	18574	table_id: # flags: STMT_END_F
-master-bin.000001	18574	Table_map	1	18615	table_id: # (test.t1)
-master-bin.000001	18615	Write_rows	1	18649	table_id: # flags: STMT_END_F
-master-bin.000001	18649	Table_map	1	18690	table_id: # (test.t1)
-master-bin.000001	18690	Write_rows	1	18724	table_id: # flags: STMT_END_F
-master-bin.000001	18724	Table_map	1	18765	table_id: # (test.t1)
-master-bin.000001	18765	Write_rows	1	18799	table_id: # flags: STMT_END_F
-master-bin.000001	18799	Table_map	1	18840	table_id: # (test.t1)
-master-bin.000001	18840	Write_rows	1	18874	table_id: # flags: STMT_END_F
-master-bin.000001	18874	Table_map	1	18915	table_id: # (test.t1)
-master-bin.000001	18915	Write_rows	1	18949	table_id: # flags: STMT_END_F
-master-bin.000001	18949	Table_map	1	18990	table_id: # (test.t1)
-master-bin.000001	18990	Write_rows	1	19024	table_id: # flags: STMT_END_F
-master-bin.000001	19024	Table_map	1	19065	table_id: # (test.t1)
-master-bin.000001	19065	Write_rows	1	19099	table_id: # flags: STMT_END_F
-master-bin.000001	19099	Table_map	1	19140	table_id: # (test.t1)
-master-bin.000001	19140	Write_rows	1	19174	table_id: # flags: STMT_END_F
-master-bin.000001	19174	Table_map	1	19215	table_id: # (test.t1)
-master-bin.000001	19215	Write_rows	1	19249	table_id: # flags: STMT_END_F
-master-bin.000001	19249	Table_map	1	19290	table_id: # (test.t1)
-master-bin.000001	19290	Write_rows	1	19324	table_id: # flags: STMT_END_F
-master-bin.000001	19324	Table_map	1	19365	table_id: # (test.t1)
-master-bin.000001	19365	Write_rows	1	19399	table_id: # flags: STMT_END_F
-master-bin.000001	19399	Table_map	1	19440	table_id: # (test.t1)
-master-bin.000001	19440	Write_rows	1	19474	table_id: # flags: STMT_END_F
-master-bin.000001	19474	Table_map	1	19515	table_id: # (test.t1)
-master-bin.000001	19515	Write_rows	1	19549	table_id: # flags: STMT_END_F
-master-bin.000001	19549	Table_map	1	19590	table_id: # (test.t1)
-master-bin.000001	19590	Write_rows	1	19624	table_id: # flags: STMT_END_F
-master-bin.000001	19624	Table_map	1	19665	table_id: # (test.t1)
-master-bin.000001	19665	Write_rows	1	19699	table_id: # flags: STMT_END_F
-master-bin.000001	19699	Table_map	1	19740	table_id: # (test.t1)
-master-bin.000001	19740	Write_rows	1	19774	table_id: # flags: STMT_END_F
-master-bin.000001	19774	Table_map	1	19815	table_id: # (test.t1)
-master-bin.000001	19815	Write_rows	1	19849	table_id: # flags: STMT_END_F
-master-bin.000001	19849	Table_map	1	19890	table_id: # (test.t1)
-master-bin.000001	19890	Write_rows	1	19924	table_id: # flags: STMT_END_F
-master-bin.000001	19924	Table_map	1	19965	table_id: # (test.t1)
-master-bin.000001	19965	Write_rows	1	19999	table_id: # flags: STMT_END_F
-master-bin.000001	19999	Table_map	1	20040	table_id: # (test.t1)
-master-bin.000001	20040	Write_rows	1	20074	table_id: # flags: STMT_END_F
-master-bin.000001	20074	Table_map	1	20115	table_id: # (test.t1)
-master-bin.000001	20115	Write_rows	1	20149	table_id: # flags: STMT_END_F
-master-bin.000001	20149	Table_map	1	20190	table_id: # (test.t1)
-master-bin.000001	20190	Write_rows	1	20224	table_id: # flags: STMT_END_F
-master-bin.000001	20224	Table_map	1	20265	table_id: # (test.t1)
-master-bin.000001	20265	Write_rows	1	20299	table_id: # flags: STMT_END_F
-master-bin.000001	20299	Table_map	1	20340	table_id: # (test.t1)
-master-bin.000001	20340	Write_rows	1	20374	table_id: # flags: STMT_END_F
-master-bin.000001	20374	Table_map	1	20415	table_id: # (test.t1)
-master-bin.000001	20415	Write_rows	1	20449	table_id: # flags: STMT_END_F
-master-bin.000001	20449	Table_map	1	20490	table_id: # (test.t1)
-master-bin.000001	20490	Write_rows	1	20524	table_id: # flags: STMT_END_F
-master-bin.000001	20524	Table_map	1	20565	table_id: # (test.t1)
-master-bin.000001	20565	Write_rows	1	20599	table_id: # flags: STMT_END_F
-master-bin.000001	20599	Table_map	1	20640	table_id: # (test.t1)
-master-bin.000001	20640	Write_rows	1	20674	table_id: # flags: STMT_END_F
-master-bin.000001	20674	Table_map	1	20715	table_id: # (test.t1)
-master-bin.000001	20715	Write_rows	1	20749	table_id: # flags: STMT_END_F
-master-bin.000001	20749	Table_map	1	20790	table_id: # (test.t1)
-master-bin.000001	20790	Write_rows	1	20824	table_id: # flags: STMT_END_F
-master-bin.000001	20824	Table_map	1	20865	table_id: # (test.t1)
-master-bin.000001	20865	Write_rows	1	20899	table_id: # flags: STMT_END_F
-master-bin.000001	20899	Table_map	1	20940	table_id: # (test.t1)
-master-bin.000001	20940	Write_rows	1	20974	table_id: # flags: STMT_END_F
-master-bin.000001	20974	Table_map	1	21015	table_id: # (test.t1)
-master-bin.000001	21015	Write_rows	1	21049	table_id: # flags: STMT_END_F
-master-bin.000001	21049	Table_map	1	21090	table_id: # (test.t1)
-master-bin.000001	21090	Write_rows	1	21124	table_id: # flags: STMT_END_F
-master-bin.000001	21124	Table_map	1	21165	table_id: # (test.t1)
-master-bin.000001	21165	Write_rows	1	21199	table_id: # flags: STMT_END_F
-master-bin.000001	21199	Table_map	1	21240	table_id: # (test.t1)
-master-bin.000001	21240	Write_rows	1	21274	table_id: # flags: STMT_END_F
-master-bin.000001	21274	Table_map	1	21315	table_id: # (test.t1)
-master-bin.000001	21315	Write_rows	1	21349	table_id: # flags: STMT_END_F
-master-bin.000001	21349	Table_map	1	21390	table_id: # (test.t1)
-master-bin.000001	21390	Write_rows	1	21424	table_id: # flags: STMT_END_F
-master-bin.000001	21424	Table_map	1	21465	table_id: # (test.t1)
-master-bin.000001	21465	Write_rows	1	21499	table_id: # flags: STMT_END_F
-master-bin.000001	21499	Table_map	1	21540	table_id: # (test.t1)
-master-bin.000001	21540	Write_rows	1	21574	table_id: # flags: STMT_END_F
-master-bin.000001	21574	Table_map	1	21615	table_id: # (test.t1)
-master-bin.000001	21615	Write_rows	1	21649	table_id: # flags: STMT_END_F
-master-bin.000001	21649	Table_map	1	21690	table_id: # (test.t1)
-master-bin.000001	21690	Write_rows	1	21724	table_id: # flags: STMT_END_F
-master-bin.000001	21724	Table_map	1	21765	table_id: # (test.t1)
-master-bin.000001	21765	Write_rows	1	21799	table_id: # flags: STMT_END_F
-master-bin.000001	21799	Table_map	1	21840	table_id: # (test.t1)
-master-bin.000001	21840	Write_rows	1	21874	table_id: # flags: STMT_END_F
-master-bin.000001	21874	Table_map	1	21915	table_id: # (test.t1)
-master-bin.000001	21915	Write_rows	1	21949	table_id: # flags: STMT_END_F
-master-bin.000001	21949	Table_map	1	21990	table_id: # (test.t1)
-master-bin.000001	21990	Write_rows	1	22024	table_id: # flags: STMT_END_F
-master-bin.000001	22024	Table_map	1	22065	table_id: # (test.t1)
-master-bin.000001	22065	Write_rows	1	22099	table_id: # flags: STMT_END_F
-master-bin.000001	22099	Table_map	1	22140	table_id: # (test.t1)
-master-bin.000001	22140	Write_rows	1	22174	table_id: # flags: STMT_END_F
-master-bin.000001	22174	Table_map	1	22215	table_id: # (test.t1)
-master-bin.000001	22215	Write_rows	1	22249	table_id: # flags: STMT_END_F
-master-bin.000001	22249	Table_map	1	22290	table_id: # (test.t1)
-master-bin.000001	22290	Write_rows	1	22324	table_id: # flags: STMT_END_F
-master-bin.000001	22324	Table_map	1	22365	table_id: # (test.t1)
-master-bin.000001	22365	Write_rows	1	22399	table_id: # flags: STMT_END_F
-master-bin.000001	22399	Table_map	1	22440	table_id: # (test.t1)
-master-bin.000001	22440	Write_rows	1	22474	table_id: # flags: STMT_END_F
-master-bin.000001	22474	Table_map	1	22515	table_id: # (test.t1)
-master-bin.000001	22515	Write_rows	1	22549	table_id: # flags: STMT_END_F
-master-bin.000001	22549	Table_map	1	22590	table_id: # (test.t1)
-master-bin.000001	22590	Write_rows	1	22624	table_id: # flags: STMT_END_F
-master-bin.000001	22624	Table_map	1	22665	table_id: # (test.t1)
-master-bin.000001	22665	Write_rows	1	22699	table_id: # flags: STMT_END_F
-master-bin.000001	22699	Table_map	1	22740	table_id: # (test.t1)
-master-bin.000001	22740	Write_rows	1	22774	table_id: # flags: STMT_END_F
-master-bin.000001	22774	Table_map	1	22815	table_id: # (test.t1)
-master-bin.000001	22815	Write_rows	1	22849	table_id: # flags: STMT_END_F
-master-bin.000001	22849	Table_map	1	22890	table_id: # (test.t1)
-master-bin.000001	22890	Write_rows	1	22924	table_id: # flags: STMT_END_F
-master-bin.000001	22924	Table_map	1	22965	table_id: # (test.t1)
-master-bin.000001	22965	Write_rows	1	22999	table_id: # flags: STMT_END_F
-master-bin.000001	22999	Table_map	1	23040	table_id: # (test.t1)
-master-bin.000001	23040	Write_rows	1	23074	table_id: # flags: STMT_END_F
-master-bin.000001	23074	Table_map	1	23115	table_id: # (test.t1)
-master-bin.000001	23115	Write_rows	1	23149	table_id: # flags: STMT_END_F
-master-bin.000001	23149	Table_map	1	23190	table_id: # (test.t1)
-master-bin.000001	23190	Write_rows	1	23224	table_id: # flags: STMT_END_F
-master-bin.000001	23224	Table_map	1	23265	table_id: # (test.t1)
-master-bin.000001	23265	Write_rows	1	23299	table_id: # flags: STMT_END_F
-master-bin.000001	23299	Table_map	1	23340	table_id: # (test.t1)
-master-bin.000001	23340	Write_rows	1	23374	table_id: # flags: STMT_END_F
-master-bin.000001	23374	Table_map	1	23415	table_id: # (test.t1)
-master-bin.000001	23415	Write_rows	1	23449	table_id: # flags: STMT_END_F
-master-bin.000001	23449	Table_map	1	23490	table_id: # (test.t1)
-master-bin.000001	23490	Write_rows	1	23524	table_id: # flags: STMT_END_F
-master-bin.000001	23524	Table_map	1	23565	table_id: # (test.t1)
-master-bin.000001	23565	Write_rows	1	23599	table_id: # flags: STMT_END_F
-master-bin.000001	23599	Table_map	1	23640	table_id: # (test.t1)
-master-bin.000001	23640	Write_rows	1	23674	table_id: # flags: STMT_END_F
-master-bin.000001	23674	Table_map	1	23715	table_id: # (test.t1)
-master-bin.000001	23715	Write_rows	1	23749	table_id: # flags: STMT_END_F
-master-bin.000001	23749	Table_map	1	23790	table_id: # (test.t1)
-master-bin.000001	23790	Write_rows	1	23824	table_id: # flags: STMT_END_F
-master-bin.000001	23824	Table_map	1	23865	table_id: # (test.t1)
-master-bin.000001	23865	Write_rows	1	23899	table_id: # flags: STMT_END_F
-master-bin.000001	23899	Table_map	1	23940	table_id: # (test.t1)
-master-bin.000001	23940	Write_rows	1	23974	table_id: # flags: STMT_END_F
-master-bin.000001	23974	Table_map	1	24015	table_id: # (test.t1)
-master-bin.000001	24015	Write_rows	1	24049	table_id: # flags: STMT_END_F
-master-bin.000001	24049	Table_map	1	24090	table_id: # (test.t1)
-master-bin.000001	24090	Write_rows	1	24124	table_id: # flags: STMT_END_F
-master-bin.000001	24124	Table_map	1	24165	table_id: # (test.t1)
-master-bin.000001	24165	Write_rows	1	24199	table_id: # flags: STMT_END_F
-master-bin.000001	24199	Table_map	1	24240	table_id: # (test.t1)
-master-bin.000001	24240	Write_rows	1	24274	table_id: # flags: STMT_END_F
-master-bin.000001	24274	Table_map	1	24315	table_id: # (test.t1)
-master-bin.000001	24315	Write_rows	1	24349	table_id: # flags: STMT_END_F
-master-bin.000001	24349	Table_map	1	24390	table_id: # (test.t1)
-master-bin.000001	24390	Write_rows	1	24424	table_id: # flags: STMT_END_F
-master-bin.000001	24424	Table_map	1	24465	table_id: # (test.t1)
-master-bin.000001	24465	Write_rows	1	24499	table_id: # flags: STMT_END_F
-master-bin.000001	24499	Table_map	1	24540	table_id: # (test.t1)
-master-bin.000001	24540	Write_rows	1	24574	table_id: # flags: STMT_END_F
-master-bin.000001	24574	Table_map	1	24615	table_id: # (test.t1)
-master-bin.000001	24615	Write_rows	1	24649	table_id: # flags: STMT_END_F
-master-bin.000001	24649	Table_map	1	24690	table_id: # (test.t1)
-master-bin.000001	24690	Write_rows	1	24724	table_id: # flags: STMT_END_F
-master-bin.000001	24724	Table_map	1	24765	table_id: # (test.t1)
-master-bin.000001	24765	Write_rows	1	24799	table_id: # flags: STMT_END_F
-master-bin.000001	24799	Table_map	1	24840	table_id: # (test.t1)
-master-bin.000001	24840	Write_rows	1	24874	table_id: # flags: STMT_END_F
-master-bin.000001	24874	Table_map	1	24915	table_id: # (test.t1)
-master-bin.000001	24915	Write_rows	1	24949	table_id: # flags: STMT_END_F
-master-bin.000001	24949	Table_map	1	24990	table_id: # (test.t1)
-master-bin.000001	24990	Write_rows	1	25024	table_id: # flags: STMT_END_F
-master-bin.000001	25024	Table_map	1	25065	table_id: # (test.t1)
-master-bin.000001	25065	Write_rows	1	25099	table_id: # flags: STMT_END_F
-master-bin.000001	25099	Table_map	1	25140	table_id: # (test.t1)
-master-bin.000001	25140	Write_rows	1	25174	table_id: # flags: STMT_END_F
-master-bin.000001	25174	Table_map	1	25215	table_id: # (test.t1)
-master-bin.000001	25215	Write_rows	1	25249	table_id: # flags: STMT_END_F
-master-bin.000001	25249	Table_map	1	25290	table_id: # (test.t1)
-master-bin.000001	25290	Write_rows	1	25324	table_id: # flags: STMT_END_F
-master-bin.000001	25324	Table_map	1	25365	table_id: # (test.t1)
-master-bin.000001	25365	Write_rows	1	25399	table_id: # flags: STMT_END_F
-master-bin.000001	25399	Table_map	1	25440	table_id: # (test.t1)
-master-bin.000001	25440	Write_rows	1	25474	table_id: # flags: STMT_END_F
-master-bin.000001	25474	Table_map	1	25515	table_id: # (test.t1)
-master-bin.000001	25515	Write_rows	1	25549	table_id: # flags: STMT_END_F
-master-bin.000001	25549	Table_map	1	25590	table_id: # (test.t1)
-master-bin.000001	25590	Write_rows	1	25624	table_id: # flags: STMT_END_F
-master-bin.000001	25624	Table_map	1	25665	table_id: # (test.t1)
-master-bin.000001	25665	Write_rows	1	25699	table_id: # flags: STMT_END_F
-master-bin.000001	25699	Table_map	1	25740	table_id: # (test.t1)
-master-bin.000001	25740	Write_rows	1	25774	table_id: # flags: STMT_END_F
-master-bin.000001	25774	Table_map	1	25815	table_id: # (test.t1)
-master-bin.000001	25815	Write_rows	1	25849	table_id: # flags: STMT_END_F
-master-bin.000001	25849	Table_map	1	25890	table_id: # (test.t1)
-master-bin.000001	25890	Write_rows	1	25924	table_id: # flags: STMT_END_F
-master-bin.000001	25924	Table_map	1	25965	table_id: # (test.t1)
-master-bin.000001	25965	Write_rows	1	25999	table_id: # flags: STMT_END_F
-master-bin.000001	25999	Table_map	1	26040	table_id: # (test.t1)
-master-bin.000001	26040	Write_rows	1	26074	table_id: # flags: STMT_END_F
-master-bin.000001	26074	Table_map	1	26115	table_id: # (test.t1)
-master-bin.000001	26115	Write_rows	1	26149	table_id: # flags: STMT_END_F
-master-bin.000001	26149	Table_map	1	26190	table_id: # (test.t1)
-master-bin.000001	26190	Write_rows	1	26224	table_id: # flags: STMT_END_F
-master-bin.000001	26224	Table_map	1	26265	table_id: # (test.t1)
-master-bin.000001	26265	Write_rows	1	26299	table_id: # flags: STMT_END_F
-master-bin.000001	26299	Table_map	1	26340	table_id: # (test.t1)
-master-bin.000001	26340	Write_rows	1	26374	table_id: # flags: STMT_END_F
-master-bin.000001	26374	Table_map	1	26415	table_id: # (test.t1)
-master-bin.000001	26415	Write_rows	1	26449	table_id: # flags: STMT_END_F
-master-bin.000001	26449	Table_map	1	26490	table_id: # (test.t1)
-master-bin.000001	26490	Write_rows	1	26524	table_id: # flags: STMT_END_F
-master-bin.000001	26524	Table_map	1	26565	table_id: # (test.t1)
-master-bin.000001	26565	Write_rows	1	26599	table_id: # flags: STMT_END_F
-master-bin.000001	26599	Table_map	1	26640	table_id: # (test.t1)
-master-bin.000001	26640	Write_rows	1	26674	table_id: # flags: STMT_END_F
-master-bin.000001	26674	Table_map	1	26715	table_id: # (test.t1)
-master-bin.000001	26715	Write_rows	1	26749	table_id: # flags: STMT_END_F
-master-bin.000001	26749	Table_map	1	26790	table_id: # (test.t1)
-master-bin.000001	26790	Write_rows	1	26824	table_id: # flags: STMT_END_F
-master-bin.000001	26824	Table_map	1	26865	table_id: # (test.t1)
-master-bin.000001	26865	Write_rows	1	26899	table_id: # flags: STMT_END_F
-master-bin.000001	26899	Table_map	1	26940	table_id: # (test.t1)
-master-bin.000001	26940	Write_rows	1	26974	table_id: # flags: STMT_END_F
-master-bin.000001	26974	Table_map	1	27015	table_id: # (test.t1)
-master-bin.000001	27015	Write_rows	1	27049	table_id: # flags: STMT_END_F
-master-bin.000001	27049	Table_map	1	27090	table_id: # (test.t1)
-master-bin.000001	27090	Write_rows	1	27124	table_id: # flags: STMT_END_F
-master-bin.000001	27124	Table_map	1	27165	table_id: # (test.t1)
-master-bin.000001	27165	Write_rows	1	27199	table_id: # flags: STMT_END_F
-master-bin.000001	27199	Table_map	1	27240	table_id: # (test.t1)
-master-bin.000001	27240	Write_rows	1	27274	table_id: # flags: STMT_END_F
-master-bin.000001	27274	Table_map	1	27315	table_id: # (test.t1)
-master-bin.000001	27315	Write_rows	1	27349	table_id: # flags: STMT_END_F
-master-bin.000001	27349	Table_map	1	27390	table_id: # (test.t1)
-master-bin.000001	27390	Write_rows	1	27424	table_id: # flags: STMT_END_F
-master-bin.000001	27424	Table_map	1	27465	table_id: # (test.t1)
-master-bin.000001	27465	Write_rows	1	27499	table_id: # flags: STMT_END_F
-master-bin.000001	27499	Table_map	1	27540	table_id: # (test.t1)
-master-bin.000001	27540	Write_rows	1	27574	table_id: # flags: STMT_END_F
-master-bin.000001	27574	Table_map	1	27615	table_id: # (test.t1)
-master-bin.000001	27615	Write_rows	1	27649	table_id: # flags: STMT_END_F
-master-bin.000001	27649	Table_map	1	27690	table_id: # (test.t1)
-master-bin.000001	27690	Write_rows	1	27724	table_id: # flags: STMT_END_F
-master-bin.000001	27724	Table_map	1	27765	table_id: # (test.t1)
-master-bin.000001	27765	Write_rows	1	27799	table_id: # flags: STMT_END_F
-master-bin.000001	27799	Table_map	1	27840	table_id: # (test.t1)
-master-bin.000001	27840	Write_rows	1	27874	table_id: # flags: STMT_END_F
-master-bin.000001	27874	Table_map	1	27915	table_id: # (test.t1)
-master-bin.000001	27915	Write_rows	1	27949	table_id: # flags: STMT_END_F
-master-bin.000001	27949	Table_map	1	27990	table_id: # (test.t1)
-master-bin.000001	27990	Write_rows	1	28024	table_id: # flags: STMT_END_F
-master-bin.000001	28024	Table_map	1	28065	table_id: # (test.t1)
-master-bin.000001	28065	Write_rows	1	28099	table_id: # flags: STMT_END_F
-master-bin.000001	28099	Table_map	1	28140	table_id: # (test.t1)
-master-bin.000001	28140	Write_rows	1	28174	table_id: # flags: STMT_END_F
-master-bin.000001	28174	Table_map	1	28215	table_id: # (test.t1)
-master-bin.000001	28215	Write_rows	1	28249	table_id: # flags: STMT_END_F
-master-bin.000001	28249	Table_map	1	28290	table_id: # (test.t1)
-master-bin.000001	28290	Write_rows	1	28324	table_id: # flags: STMT_END_F
-master-bin.000001	28324	Table_map	1	28365	table_id: # (test.t1)
-master-bin.000001	28365	Write_rows	1	28399	table_id: # flags: STMT_END_F
-master-bin.000001	28399	Table_map	1	28440	table_id: # (test.t1)
-master-bin.000001	28440	Write_rows	1	28474	table_id: # flags: STMT_END_F
-master-bin.000001	28474	Table_map	1	28515	table_id: # (test.t1)
-master-bin.000001	28515	Write_rows	1	28549	table_id: # flags: STMT_END_F
-master-bin.000001	28549	Table_map	1	28590	table_id: # (test.t1)
-master-bin.000001	28590	Write_rows	1	28624	table_id: # flags: STMT_END_F
-master-bin.000001	28624	Table_map	1	28665	table_id: # (test.t1)
-master-bin.000001	28665	Write_rows	1	28699	table_id: # flags: STMT_END_F
-master-bin.000001	28699	Table_map	1	28740	table_id: # (test.t1)
-master-bin.000001	28740	Write_rows	1	28774	table_id: # flags: STMT_END_F
-master-bin.000001	28774	Table_map	1	28815	table_id: # (test.t1)
-master-bin.000001	28815	Write_rows	1	28849	table_id: # flags: STMT_END_F
-master-bin.000001	28849	Table_map	1	28890	table_id: # (test.t1)
-master-bin.000001	28890	Write_rows	1	28924	table_id: # flags: STMT_END_F
-master-bin.000001	28924	Table_map	1	28965	table_id: # (test.t1)
-master-bin.000001	28965	Write_rows	1	28999	table_id: # flags: STMT_END_F
-master-bin.000001	28999	Table_map	1	29040	table_id: # (test.t1)
-master-bin.000001	29040	Write_rows	1	29074	table_id: # flags: STMT_END_F
-master-bin.000001	29074	Table_map	1	29115	table_id: # (test.t1)
-master-bin.000001	29115	Write_rows	1	29149	table_id: # flags: STMT_END_F
-master-bin.000001	29149	Table_map	1	29190	table_id: # (test.t1)
-master-bin.000001	29190	Write_rows	1	29224	table_id: # flags: STMT_END_F
-master-bin.000001	29224	Table_map	1	29265	table_id: # (test.t1)
-master-bin.000001	29265	Write_rows	1	29299	table_id: # flags: STMT_END_F
-master-bin.000001	29299	Table_map	1	29340	table_id: # (test.t1)
-master-bin.000001	29340	Write_rows	1	29374	table_id: # flags: STMT_END_F
-master-bin.000001	29374	Table_map	1	29415	table_id: # (test.t1)
-master-bin.000001	29415	Write_rows	1	29449	table_id: # flags: STMT_END_F
-master-bin.000001	29449	Table_map	1	29490	table_id: # (test.t1)
-master-bin.000001	29490	Write_rows	1	29524	table_id: # flags: STMT_END_F
-master-bin.000001	29524	Table_map	1	29565	table_id: # (test.t1)
-master-bin.000001	29565	Write_rows	1	29599	table_id: # flags: STMT_END_F
-master-bin.000001	29599	Table_map	1	29640	table_id: # (test.t1)
-master-bin.000001	29640	Write_rows	1	29674	table_id: # flags: STMT_END_F
-master-bin.000001	29674	Table_map	1	29715	table_id: # (test.t1)
-master-bin.000001	29715	Write_rows	1	29749	table_id: # flags: STMT_END_F
-master-bin.000001	29749	Table_map	1	29790	table_id: # (test.t1)
-master-bin.000001	29790	Write_rows	1	29824	table_id: # flags: STMT_END_F
-master-bin.000001	29824	Table_map	1	29865	table_id: # (test.t1)
-master-bin.000001	29865	Write_rows	1	29899	table_id: # flags: STMT_END_F
-master-bin.000001	29899	Table_map	1	29940	table_id: # (test.t1)
-master-bin.000001	29940	Write_rows	1	29974	table_id: # flags: STMT_END_F
-master-bin.000001	29974	Table_map	1	30015	table_id: # (test.t1)
-master-bin.000001	30015	Write_rows	1	30049	table_id: # flags: STMT_END_F
-master-bin.000001	30049	Table_map	1	30090	table_id: # (test.t1)
-master-bin.000001	30090	Write_rows	1	30124	table_id: # flags: STMT_END_F
-master-bin.000001	30124	Table_map	1	30165	table_id: # (test.t1)
-master-bin.000001	30165	Write_rows	1	30199	table_id: # flags: STMT_END_F
-master-bin.000001	30199	Table_map	1	30240	table_id: # (test.t1)
-master-bin.000001	30240	Write_rows	1	30274	table_id: # flags: STMT_END_F
-master-bin.000001	30274	Xid	1	30301	COMMIT /* XID */
-master-bin.000001	30301	Rotate	1	30345	master-bin.000002;pos=4
+master-bin.000001	499	Xid	1	526	COMMIT /* XID */
+master-bin.000001	526	Query	1	602	use `test`; drop table t1
+set @bcs = @@binlog_cache_size;
+set global binlog_cache_size=4096;
+reset master;
+create table t1 (a int) engine=innodb;
+show binlog events from 0;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	4	Format_desc	1	107	Server version, Binlog ver: 4
+master-bin.000001	107	Query	1	207	use `test`; create table t1 (a int) engine=innodb
+master-bin.000001	207	Query	1	275	use `test`; BEGIN
+master-bin.000001	275	Table_map	1	316	table_id: # (test.t1)
+master-bin.000001	316	Write_rows	1	350	table_id: # flags: STMT_END_F
+master-bin.000001	350	Table_map	1	391	table_id: # (test.t1)
+master-bin.000001	391	Write_rows	1	425	table_id: # flags: STMT_END_F
+master-bin.000001	425	Table_map	1	466	table_id: # (test.t1)
+master-bin.000001	466	Write_rows	1	500	table_id: # flags: STMT_END_F
+master-bin.000001	500	Table_map	1	541	table_id: # (test.t1)
+master-bin.000001	541	Write_rows	1	575	table_id: # flags: STMT_END_F
+master-bin.000001	575	Table_map	1	616	table_id: # (test.t1)
+master-bin.000001	616	Write_rows	1	650	table_id: # flags: STMT_END_F
+master-bin.000001	650	Table_map	1	691	table_id: # (test.t1)
+master-bin.000001	691	Write_rows	1	725	table_id: # flags: STMT_END_F
+master-bin.000001	725	Table_map	1	766	table_id: # (test.t1)
+master-bin.000001	766	Write_rows	1	800	table_id: # flags: STMT_END_F
+master-bin.000001	800	Table_map	1	841	table_id: # (test.t1)
+master-bin.000001	841	Write_rows	1	875	table_id: # flags: STMT_END_F
+master-bin.000001	875	Table_map	1	916	table_id: # (test.t1)
+master-bin.000001	916	Write_rows	1	950	table_id: # flags: STMT_END_F
+master-bin.000001	950	Table_map	1	991	table_id: # (test.t1)
+master-bin.000001	991	Write_rows	1	1025	table_id: # flags: STMT_END_F
+master-bin.000001	1025	Table_map	1	1066	table_id: # (test.t1)
+master-bin.000001	1066	Write_rows	1	1100	table_id: # flags: STMT_END_F
+master-bin.000001	1100	Table_map	1	1141	table_id: # (test.t1)
+master-bin.000001	1141	Write_rows	1	1175	table_id: # flags: STMT_END_F
+master-bin.000001	1175	Table_map	1	1216	table_id: # (test.t1)
+master-bin.000001	1216	Write_rows	1	1250	table_id: # flags: STMT_END_F
+master-bin.000001	1250	Table_map	1	1291	table_id: # (test.t1)
+master-bin.000001	1291	Write_rows	1	1325	table_id: # flags: STMT_END_F
+master-bin.000001	1325	Table_map	1	1366	table_id: # (test.t1)
+master-bin.000001	1366	Write_rows	1	1400	table_id: # flags: STMT_END_F
+master-bin.000001	1400	Table_map	1	1441	table_id: # (test.t1)
+master-bin.000001	1441	Write_rows	1	1475	table_id: # flags: STMT_END_F
+master-bin.000001	1475	Table_map	1	1516	table_id: # (test.t1)
+master-bin.000001	1516	Write_rows	1	1550	table_id: # flags: STMT_END_F
+master-bin.000001	1550	Table_map	1	1591	table_id: # (test.t1)
+master-bin.000001	1591	Write_rows	1	1625	table_id: # flags: STMT_END_F
+master-bin.000001	1625	Table_map	1	1666	table_id: # (test.t1)
+master-bin.000001	1666	Write_rows	1	1700	table_id: # flags: STMT_END_F
+master-bin.000001	1700	Table_map	1	1741	table_id: # (test.t1)
+master-bin.000001	1741	Write_rows	1	1775	table_id: # flags: STMT_END_F
+master-bin.000001	1775	Table_map	1	1816	table_id: # (test.t1)
+master-bin.000001	1816	Write_rows	1	1850	table_id: # flags: STMT_END_F
+master-bin.000001	1850	Table_map	1	1891	table_id: # (test.t1)
+master-bin.000001	1891	Write_rows	1	1925	table_id: # flags: STMT_END_F
+master-bin.000001	1925	Table_map	1	1966	table_id: # (test.t1)
+master-bin.000001	1966	Write_rows	1	2000	table_id: # flags: STMT_END_F
+master-bin.000001	2000	Table_map	1	2041	table_id: # (test.t1)
+master-bin.000001	2041	Write_rows	1	2075	table_id: # flags: STMT_END_F
+master-bin.000001	2075	Table_map	1	2116	table_id: # (test.t1)
+master-bin.000001	2116	Write_rows	1	2150	table_id: # flags: STMT_END_F
+master-bin.000001	2150	Table_map	1	2191	table_id: # (test.t1)
+master-bin.000001	2191	Write_rows	1	2225	table_id: # flags: STMT_END_F
+master-bin.000001	2225	Table_map	1	2266	table_id: # (test.t1)
+master-bin.000001	2266	Write_rows	1	2300	table_id: # flags: STMT_END_F
+master-bin.000001	2300	Table_map	1	2341	table_id: # (test.t1)
+master-bin.000001	2341	Write_rows	1	2375	table_id: # flags: STMT_END_F
+master-bin.000001	2375	Table_map	1	2416	table_id: # (test.t1)
+master-bin.000001	2416	Write_rows	1	2450	table_id: # flags: STMT_END_F
+master-bin.000001	2450	Table_map	1	2491	table_id: # (test.t1)
+master-bin.000001	2491	Write_rows	1	2525	table_id: # flags: STMT_END_F
+master-bin.000001	2525	Table_map	1	2566	table_id: # (test.t1)
+master-bin.000001	2566	Write_rows	1	2600	table_id: # flags: STMT_END_F
+master-bin.000001	2600	Table_map	1	2641	table_id: # (test.t1)
+master-bin.000001	2641	Write_rows	1	2675	table_id: # flags: STMT_END_F
+master-bin.000001	2675	Table_map	1	2716	table_id: # (test.t1)
+master-bin.000001	2716	Write_rows	1	2750	table_id: # flags: STMT_END_F
+master-bin.000001	2750	Table_map	1	2791	table_id: # (test.t1)
+master-bin.000001	2791	Write_rows	1	2825	table_id: # flags: STMT_END_F
+master-bin.000001	2825	Table_map	1	2866	table_id: # (test.t1)
+master-bin.000001	2866	Write_rows	1	2900	table_id: # flags: STMT_END_F
+master-bin.000001	2900	Table_map	1	2941	table_id: # (test.t1)
+master-bin.000001	2941	Write_rows	1	2975	table_id: # flags: STMT_END_F
+master-bin.000001	2975	Table_map	1	3016	table_id: # (test.t1)
+master-bin.000001	3016	Write_rows	1	3050	table_id: # flags: STMT_END_F
+master-bin.000001	3050	Table_map	1	3091	table_id: # (test.t1)
+master-bin.000001	3091	Write_rows	1	3125	table_id: # flags: STMT_END_F
+master-bin.000001	3125	Table_map	1	3166	table_id: # (test.t1)
+master-bin.000001	3166	Write_rows	1	3200	table_id: # flags: STMT_END_F
+master-bin.000001	3200	Table_map	1	3241	table_id: # (test.t1)
+master-bin.000001	3241	Write_rows	1	3275	table_id: # flags: STMT_END_F
+master-bin.000001	3275	Table_map	1	3316	table_id: # (test.t1)
+master-bin.000001	3316	Write_rows	1	3350	table_id: # flags: STMT_END_F
+master-bin.000001	3350	Table_map	1	3391	table_id: # (test.t1)
+master-bin.000001	3391	Write_rows	1	3425	table_id: # flags: STMT_END_F
+master-bin.000001	3425	Table_map	1	3466	table_id: # (test.t1)
+master-bin.000001	3466	Write_rows	1	3500	table_id: # flags: STMT_END_F
+master-bin.000001	3500	Table_map	1	3541	table_id: # (test.t1)
+master-bin.000001	3541	Write_rows	1	3575	table_id: # flags: STMT_END_F
+master-bin.000001	3575	Table_map	1	3616	table_id: # (test.t1)
+master-bin.000001	3616	Write_rows	1	3650	table_id: # flags: STMT_END_F
+master-bin.000001	3650	Table_map	1	3691	table_id: # (test.t1)
+master-bin.000001	3691	Write_rows	1	3725	table_id: # flags: STMT_END_F
+master-bin.000001	3725	Table_map	1	3766	table_id: # (test.t1)
+master-bin.000001	3766	Write_rows	1	3800	table_id: # flags: STMT_END_F
+master-bin.000001	3800	Table_map	1	3841	table_id: # (test.t1)
+master-bin.000001	3841	Write_rows	1	3875	table_id: # flags: STMT_END_F
+master-bin.000001	3875	Table_map	1	3916	table_id: # (test.t1)
+master-bin.000001	3916	Write_rows	1	3950	table_id: # flags: STMT_END_F
+master-bin.000001	3950	Table_map	1	3991	table_id: # (test.t1)
+master-bin.000001	3991	Write_rows	1	4025	table_id: # flags: STMT_END_F
+master-bin.000001	4025	Table_map	1	4066	table_id: # (test.t1)
+master-bin.000001	4066	Write_rows	1	4100	table_id: # flags: STMT_END_F
+master-bin.000001	4100	Table_map	1	4141	table_id: # (test.t1)
+master-bin.000001	4141	Write_rows	1	4175	table_id: # flags: STMT_END_F
+master-bin.000001	4175	Table_map	1	4216	table_id: # (test.t1)
+master-bin.000001	4216	Write_rows	1	4250	table_id: # flags: STMT_END_F
+master-bin.000001	4250	Table_map	1	4291	table_id: # (test.t1)
+master-bin.000001	4291	Write_rows	1	4325	table_id: # flags: STMT_END_F
+master-bin.000001	4325	Table_map	1	4366	table_id: # (test.t1)
+master-bin.000001	4366	Write_rows	1	4400	table_id: # flags: STMT_END_F
+master-bin.000001	4400	Table_map	1	4441	table_id: # (test.t1)
+master-bin.000001	4441	Write_rows	1	4475	table_id: # flags: STMT_END_F
+master-bin.000001	4475	Table_map	1	4516	table_id: # (test.t1)
+master-bin.000001	4516	Write_rows	1	4550	table_id: # flags: STMT_END_F
+master-bin.000001	4550	Table_map	1	4591	table_id: # (test.t1)
+master-bin.000001	4591	Write_rows	1	4625	table_id: # flags: STMT_END_F
+master-bin.000001	4625	Table_map	1	4666	table_id: # (test.t1)
+master-bin.000001	4666	Write_rows	1	4700	table_id: # flags: STMT_END_F
+master-bin.000001	4700	Table_map	1	4741	table_id: # (test.t1)
+master-bin.000001	4741	Write_rows	1	4775	table_id: # flags: STMT_END_F
+master-bin.000001	4775	Table_map	1	4816	table_id: # (test.t1)
+master-bin.000001	4816	Write_rows	1	4850	table_id: # flags: STMT_END_F
+master-bin.000001	4850	Table_map	1	4891	table_id: # (test.t1)
+master-bin.000001	4891	Write_rows	1	4925	table_id: # flags: STMT_END_F
+master-bin.000001	4925	Table_map	1	4966	table_id: # (test.t1)
+master-bin.000001	4966	Write_rows	1	5000	table_id: # flags: STMT_END_F
+master-bin.000001	5000	Table_map	1	5041	table_id: # (test.t1)
+master-bin.000001	5041	Write_rows	1	5075	table_id: # flags: STMT_END_F
+master-bin.000001	5075	Table_map	1	5116	table_id: # (test.t1)
+master-bin.000001	5116	Write_rows	1	5150	table_id: # flags: STMT_END_F
+master-bin.000001	5150	Table_map	1	5191	table_id: # (test.t1)
+master-bin.000001	5191	Write_rows	1	5225	table_id: # flags: STMT_END_F
+master-bin.000001	5225	Table_map	1	5266	table_id: # (test.t1)
+master-bin.000001	5266	Write_rows	1	5300	table_id: # flags: STMT_END_F
+master-bin.000001	5300	Table_map	1	5341	table_id: # (test.t1)
+master-bin.000001	5341	Write_rows	1	5375	table_id: # flags: STMT_END_F
+master-bin.000001	5375	Table_map	1	5416	table_id: # (test.t1)
+master-bin.000001	5416	Write_rows	1	5450	table_id: # flags: STMT_END_F
+master-bin.000001	5450	Table_map	1	5491	table_id: # (test.t1)
+master-bin.000001	5491	Write_rows	1	5525	table_id: # flags: STMT_END_F
+master-bin.000001	5525	Table_map	1	5566	table_id: # (test.t1)
+master-bin.000001	5566	Write_rows	1	5600	table_id: # flags: STMT_END_F
+master-bin.000001	5600	Table_map	1	5641	table_id: # (test.t1)
+master-bin.000001	5641	Write_rows	1	5675	table_id: # flags: STMT_END_F
+master-bin.000001	5675	Table_map	1	5716	table_id: # (test.t1)
+master-bin.000001	5716	Write_rows	1	5750	table_id: # flags: STMT_END_F
+master-bin.000001	5750	Table_map	1	5791	table_id: # (test.t1)
+master-bin.000001	5791	Write_rows	1	5825	table_id: # flags: STMT_END_F
+master-bin.000001	5825	Table_map	1	5866	table_id: # (test.t1)
+master-bin.000001	5866	Write_rows	1	5900	table_id: # flags: STMT_END_F
+master-bin.000001	5900	Table_map	1	5941	table_id: # (test.t1)
+master-bin.000001	5941	Write_rows	1	5975	table_id: # flags: STMT_END_F
+master-bin.000001	5975	Table_map	1	6016	table_id: # (test.t1)
+master-bin.000001	6016	Write_rows	1	6050	table_id: # flags: STMT_END_F
+master-bin.000001	6050	Table_map	1	6091	table_id: # (test.t1)
+master-bin.000001	6091	Write_rows	1	6125	table_id: # flags: STMT_END_F
+master-bin.000001	6125	Table_map	1	6166	table_id: # (test.t1)
+master-bin.000001	6166	Write_rows	1	6200	table_id: # flags: STMT_END_F
+master-bin.000001	6200	Table_map	1	6241	table_id: # (test.t1)
+master-bin.000001	6241	Write_rows	1	6275	table_id: # flags: STMT_END_F
+master-bin.000001	6275	Table_map	1	6316	table_id: # (test.t1)
+master-bin.000001	6316	Write_rows	1	6350	table_id: # flags: STMT_END_F
+master-bin.000001	6350	Table_map	1	6391	table_id: # (test.t1)
+master-bin.000001	6391	Write_rows	1	6425	table_id: # flags: STMT_END_F
+master-bin.000001	6425	Table_map	1	6466	table_id: # (test.t1)
+master-bin.000001	6466	Write_rows	1	6500	table_id: # flags: STMT_END_F
+master-bin.000001	6500	Table_map	1	6541	table_id: # (test.t1)
+master-bin.000001	6541	Write_rows	1	6575	table_id: # flags: STMT_END_F
+master-bin.000001	6575	Table_map	1	6616	table_id: # (test.t1)
+master-bin.000001	6616	Write_rows	1	6650	table_id: # flags: STMT_END_F
+master-bin.000001	6650	Table_map	1	6691	table_id: # (test.t1)
+master-bin.000001	6691	Write_rows	1	6725	table_id: # flags: STMT_END_F
+master-bin.000001	6725	Table_map	1	6766	table_id: # (test.t1)
+master-bin.000001	6766	Write_rows	1	6800	table_id: # flags: STMT_END_F
+master-bin.000001	6800	Table_map	1	6841	table_id: # (test.t1)
+master-bin.000001	6841	Write_rows	1	6875	table_id: # flags: STMT_END_F
+master-bin.000001	6875	Table_map	1	6916	table_id: # (test.t1)
+master-bin.000001	6916	Write_rows	1	6950	table_id: # flags: STMT_END_F
+master-bin.000001	6950	Table_map	1	6991	table_id: # (test.t1)
+master-bin.000001	6991	Write_rows	1	7025	table_id: # flags: STMT_END_F
+master-bin.000001	7025	Table_map	1	7066	table_id: # (test.t1)
+master-bin.000001	7066	Write_rows	1	7100	table_id: # flags: STMT_END_F
+master-bin.000001	7100	Table_map	1	7141	table_id: # (test.t1)
+master-bin.000001	7141	Write_rows	1	7175	table_id: # flags: STMT_END_F
+master-bin.000001	7175	Table_map	1	7216	table_id: # (test.t1)
+master-bin.000001	7216	Write_rows	1	7250	table_id: # flags: STMT_END_F
+master-bin.000001	7250	Table_map	1	7291	table_id: # (test.t1)
+master-bin.000001	7291	Write_rows	1	7325	table_id: # flags: STMT_END_F
+master-bin.000001	7325	Table_map	1	7366	table_id: # (test.t1)
+master-bin.000001	7366	Write_rows	1	7400	table_id: # flags: STMT_END_F
+master-bin.000001	7400	Table_map	1	7441	table_id: # (test.t1)
+master-bin.000001	7441	Write_rows	1	7475	table_id: # flags: STMT_END_F
+master-bin.000001	7475	Table_map	1	7516	table_id: # (test.t1)
+master-bin.000001	7516	Write_rows	1	7550	table_id: # flags: STMT_END_F
+master-bin.000001	7550	Table_map	1	7591	table_id: # (test.t1)
+master-bin.000001	7591	Write_rows	1	7625	table_id: # flags: STMT_END_F
+master-bin.000001	7625	Table_map	1	7666	table_id: # (test.t1)
+master-bin.000001	7666	Write_rows	1	7700	table_id: # flags: STMT_END_F
+master-bin.000001	7700	Table_map	1	7741	table_id: # (test.t1)
+master-bin.000001	7741	Write_rows	1	7775	table_id: # flags: STMT_END_F
+master-bin.000001	7775	Table_map	1	7816	table_id: # (test.t1)
+master-bin.000001	7816	Write_rows	1	7850	table_id: # flags: STMT_END_F
+master-bin.000001	7850	Table_map	1	7891	table_id: # (test.t1)
+master-bin.000001	7891	Write_rows	1	7925	table_id: # flags: STMT_END_F
+master-bin.000001	7925	Table_map	1	7966	table_id: # (test.t1)
+master-bin.000001	7966	Write_rows	1	8000	table_id: # flags: STMT_END_F
+master-bin.000001	8000	Table_map	1	8041	table_id: # (test.t1)
+master-bin.000001	8041	Write_rows	1	8075	table_id: # flags: STMT_END_F
+master-bin.000001	8075	Table_map	1	8116	table_id: # (test.t1)
+master-bin.000001	8116	Write_rows	1	8150	table_id: # flags: STMT_END_F
+master-bin.000001	8150	Table_map	1	8191	table_id: # (test.t1)
+master-bin.000001	8191	Write_rows	1	8225	table_id: # flags: STMT_END_F
+master-bin.000001	8225	Table_map	1	8266	table_id: # (test.t1)
+master-bin.000001	8266	Write_rows	1	8300	table_id: # flags: STMT_END_F
+master-bin.000001	8300	Table_map	1	8341	table_id: # (test.t1)
+master-bin.000001	8341	Write_rows	1	8375	table_id: # flags: STMT_END_F
+master-bin.000001	8375	Table_map	1	8416	table_id: # (test.t1)
+master-bin.000001	8416	Write_rows	1	8450	table_id: # flags: STMT_END_F
+master-bin.000001	8450	Table_map	1	8491	table_id: # (test.t1)
+master-bin.000001	8491	Write_rows	1	8525	table_id: # flags: STMT_END_F
+master-bin.000001	8525	Table_map	1	8566	table_id: # (test.t1)
+master-bin.000001	8566	Write_rows	1	8600	table_id: # flags: STMT_END_F
+master-bin.000001	8600	Table_map	1	8641	table_id: # (test.t1)
+master-bin.000001	8641	Write_rows	1	8675	table_id: # flags: STMT_END_F
+master-bin.000001	8675	Table_map	1	8716	table_id: # (test.t1)
+master-bin.000001	8716	Write_rows	1	8750	table_id: # flags: STMT_END_F
+master-bin.000001	8750	Table_map	1	8791	table_id: # (test.t1)
+master-bin.000001	8791	Write_rows	1	8825	table_id: # flags: STMT_END_F
+master-bin.000001	8825	Table_map	1	8866	table_id: # (test.t1)
+master-bin.000001	8866	Write_rows	1	8900	table_id: # flags: STMT_END_F
+master-bin.000001	8900	Table_map	1	8941	table_id: # (test.t1)
+master-bin.000001	8941	Write_rows	1	8975	table_id: # flags: STMT_END_F
+master-bin.000001	8975	Table_map	1	9016	table_id: # (test.t1)
+master-bin.000001	9016	Write_rows	1	9050	table_id: # flags: STMT_END_F
+master-bin.000001	9050	Table_map	1	9091	table_id: # (test.t1)
+master-bin.000001	9091	Write_rows	1	9125	table_id: # flags: STMT_END_F
+master-bin.000001	9125	Table_map	1	9166	table_id: # (test.t1)
+master-bin.000001	9166	Write_rows	1	9200	table_id: # flags: STMT_END_F
+master-bin.000001	9200	Table_map	1	9241	table_id: # (test.t1)
+master-bin.000001	9241	Write_rows	1	9275	table_id: # flags: STMT_END_F
+master-bin.000001	9275	Table_map	1	9316	table_id: # (test.t1)
+master-bin.000001	9316	Write_rows	1	9350	table_id: # flags: STMT_END_F
+master-bin.000001	9350	Table_map	1	9391	table_id: # (test.t1)
+master-bin.000001	9391	Write_rows	1	9425	table_id: # flags: STMT_END_F
+master-bin.000001	9425	Table_map	1	9466	table_id: # (test.t1)
+master-bin.000001	9466	Write_rows	1	9500	table_id: # flags: STMT_END_F
+master-bin.000001	9500	Table_map	1	9541	table_id: # (test.t1)
+master-bin.000001	9541	Write_rows	1	9575	table_id: # flags: STMT_END_F
+master-bin.000001	9575	Table_map	1	9616	table_id: # (test.t1)
+master-bin.000001	9616	Write_rows	1	9650	table_id: # flags: STMT_END_F
+master-bin.000001	9650	Table_map	1	9691	table_id: # (test.t1)
+master-bin.000001	9691	Write_rows	1	9725	table_id: # flags: STMT_END_F
+master-bin.000001	9725	Table_map	1	9766	table_id: # (test.t1)
+master-bin.000001	9766	Write_rows	1	9800	table_id: # flags: STMT_END_F
+master-bin.000001	9800	Table_map	1	9841	table_id: # (test.t1)
+master-bin.000001	9841	Write_rows	1	9875	table_id: # flags: STMT_END_F
+master-bin.000001	9875	Table_map	1	9916	table_id: # (test.t1)
+master-bin.000001	9916	Write_rows	1	9950	table_id: # flags: STMT_END_F
+master-bin.000001	9950	Table_map	1	9991	table_id: # (test.t1)
+master-bin.000001	9991	Write_rows	1	10025	table_id: # flags: STMT_END_F
+master-bin.000001	10025	Table_map	1	10066	table_id: # (test.t1)
+master-bin.000001	10066	Write_rows	1	10100	table_id: # flags: STMT_END_F
+master-bin.000001	10100	Table_map	1	10141	table_id: # (test.t1)
+master-bin.000001	10141	Write_rows	1	10175	table_id: # flags: STMT_END_F
+master-bin.000001	10175	Table_map	1	10216	table_id: # (test.t1)
+master-bin.000001	10216	Write_rows	1	10250	table_id: # flags: STMT_END_F
+master-bin.000001	10250	Table_map	1	10291	table_id: # (test.t1)
+master-bin.000001	10291	Write_rows	1	10325	table_id: # flags: STMT_END_F
+master-bin.000001	10325	Table_map	1	10366	table_id: # (test.t1)
+master-bin.000001	10366	Write_rows	1	10400	table_id: # flags: STMT_END_F
+master-bin.000001	10400	Table_map	1	10441	table_id: # (test.t1)
+master-bin.000001	10441	Write_rows	1	10475	table_id: # flags: STMT_END_F
+master-bin.000001	10475	Table_map	1	10516	table_id: # (test.t1)
+master-bin.000001	10516	Write_rows	1	10550	table_id: # flags: STMT_END_F
+master-bin.000001	10550	Table_map	1	10591	table_id: # (test.t1)
+master-bin.000001	10591	Write_rows	1	10625	table_id: # flags: STMT_END_F
+master-bin.000001	10625	Table_map	1	10666	table_id: # (test.t1)
+master-bin.000001	10666	Write_rows	1	10700	table_id: # flags: STMT_END_F
+master-bin.000001	10700	Table_map	1	10741	table_id: # (test.t1)
+master-bin.000001	10741	Write_rows	1	10775	table_id: # flags: STMT_END_F
+master-bin.000001	10775	Table_map	1	10816	table_id: # (test.t1)
+master-bin.000001	10816	Write_rows	1	10850	table_id: # flags: STMT_END_F
+master-bin.000001	10850	Table_map	1	10891	table_id: # (test.t1)
+master-bin.000001	10891	Write_rows	1	10925	table_id: # flags: STMT_END_F
+master-bin.000001	10925	Table_map	1	10966	table_id: # (test.t1)
+master-bin.000001	10966	Write_rows	1	11000	table_id: # flags: STMT_END_F
+master-bin.000001	11000	Table_map	1	11041	table_id: # (test.t1)
+master-bin.000001	11041	Write_rows	1	11075	table_id: # flags: STMT_END_F
+master-bin.000001	11075	Table_map	1	11116	table_id: # (test.t1)
+master-bin.000001	11116	Write_rows	1	11150	table_id: # flags: STMT_END_F
+master-bin.000001	11150	Table_map	1	11191	table_id: # (test.t1)
+master-bin.000001	11191	Write_rows	1	11225	table_id: # flags: STMT_END_F
+master-bin.000001	11225	Table_map	1	11266	table_id: # (test.t1)
+master-bin.000001	11266	Write_rows	1	11300	table_id: # flags: STMT_END_F
+master-bin.000001	11300	Table_map	1	11341	table_id: # (test.t1)
+master-bin.000001	11341	Write_rows	1	11375	table_id: # flags: STMT_END_F
+master-bin.000001	11375	Table_map	1	11416	table_id: # (test.t1)
+master-bin.000001	11416	Write_rows	1	11450	table_id: # flags: STMT_END_F
+master-bin.000001	11450	Table_map	1	11491	table_id: # (test.t1)
+master-bin.000001	11491	Write_rows	1	11525	table_id: # flags: STMT_END_F
+master-bin.000001	11525	Table_map	1	11566	table_id: # (test.t1)
+master-bin.000001	11566	Write_rows	1	11600	table_id: # flags: STMT_END_F
+master-bin.000001	11600	Table_map	1	11641	table_id: # (test.t1)
+master-bin.000001	11641	Write_rows	1	11675	table_id: # flags: STMT_END_F
+master-bin.000001	11675	Table_map	1	11716	table_id: # (test.t1)
+master-bin.000001	11716	Write_rows	1	11750	table_id: # flags: STMT_END_F
+master-bin.000001	11750	Table_map	1	11791	table_id: # (test.t1)
+master-bin.000001	11791	Write_rows	1	11825	table_id: # flags: STMT_END_F
+master-bin.000001	11825	Table_map	1	11866	table_id: # (test.t1)
+master-bin.000001	11866	Write_rows	1	11900	table_id: # flags: STMT_END_F
+master-bin.000001	11900	Table_map	1	11941	table_id: # (test.t1)
+master-bin.000001	11941	Write_rows	1	11975	table_id: # flags: STMT_END_F
+master-bin.000001	11975	Table_map	1	12016	table_id: # (test.t1)
+master-bin.000001	12016	Write_rows	1	12050	table_id: # flags: STMT_END_F
+master-bin.000001	12050	Table_map	1	12091	table_id: # (test.t1)
+master-bin.000001	12091	Write_rows	1	12125	table_id: # flags: STMT_END_F
+master-bin.000001	12125	Table_map	1	12166	table_id: # (test.t1)
+master-bin.000001	12166	Write_rows	1	12200	table_id: # flags: STMT_END_F
+master-bin.000001	12200	Table_map	1	12241	table_id: # (test.t1)
+master-bin.000001	12241	Write_rows	1	12275	table_id: # flags: STMT_END_F
+master-bin.000001	12275	Table_map	1	12316	table_id: # (test.t1)
+master-bin.000001	12316	Write_rows	1	12350	table_id: # flags: STMT_END_F
+master-bin.000001	12350	Table_map	1	12391	table_id: # (test.t1)
+master-bin.000001	12391	Write_rows	1	12425	table_id: # flags: STMT_END_F
+master-bin.000001	12425	Table_map	1	12466	table_id: # (test.t1)
+master-bin.000001	12466	Write_rows	1	12500	table_id: # flags: STMT_END_F
+master-bin.000001	12500	Table_map	1	12541	table_id: # (test.t1)
+master-bin.000001	12541	Write_rows	1	12575	table_id: # flags: STMT_END_F
+master-bin.000001	12575	Table_map	1	12616	table_id: # (test.t1)
+master-bin.000001	12616	Write_rows	1	12650	table_id: # flags: STMT_END_F
+master-bin.000001	12650	Table_map	1	12691	table_id: # (test.t1)
+master-bin.000001	12691	Write_rows	1	12725	table_id: # flags: STMT_END_F
+master-bin.000001	12725	Table_map	1	12766	table_id: # (test.t1)
+master-bin.000001	12766	Write_rows	1	12800	table_id: # flags: STMT_END_F
+master-bin.000001	12800	Table_map	1	12841	table_id: # (test.t1)
+master-bin.000001	12841	Write_rows	1	12875	table_id: # flags: STMT_END_F
+master-bin.000001	12875	Table_map	1	12916	table_id: # (test.t1)
+master-bin.000001	12916	Write_rows	1	12950	table_id: # flags: STMT_END_F
+master-bin.000001	12950	Table_map	1	12991	table_id: # (test.t1)
+master-bin.000001	12991	Write_rows	1	13025	table_id: # flags: STMT_END_F
+master-bin.000001	13025	Table_map	1	13066	table_id: # (test.t1)
+master-bin.000001	13066	Write_rows	1	13100	table_id: # flags: STMT_END_F
+master-bin.000001	13100	Table_map	1	13141	table_id: # (test.t1)
+master-bin.000001	13141	Write_rows	1	13175	table_id: # flags: STMT_END_F
+master-bin.000001	13175	Table_map	1	13216	table_id: # (test.t1)
+master-bin.000001	13216	Write_rows	1	13250	table_id: # flags: STMT_END_F
+master-bin.000001	13250	Table_map	1	13291	table_id: # (test.t1)
+master-bin.000001	13291	Write_rows	1	13325	table_id: # flags: STMT_END_F
+master-bin.000001	13325	Table_map	1	13366	table_id: # (test.t1)
+master-bin.000001	13366	Write_rows	1	13400	table_id: # flags: STMT_END_F
+master-bin.000001	13400	Table_map	1	13441	table_id: # (test.t1)
+master-bin.000001	13441	Write_rows	1	13475	table_id: # flags: STMT_END_F
+master-bin.000001	13475	Table_map	1	13516	table_id: # (test.t1)
+master-bin.000001	13516	Write_rows	1	13550	table_id: # flags: STMT_END_F
+master-bin.000001	13550	Table_map	1	13591	table_id: # (test.t1)
+master-bin.000001	13591	Write_rows	1	13625	table_id: # flags: STMT_END_F
+master-bin.000001	13625	Table_map	1	13666	table_id: # (test.t1)
+master-bin.000001	13666	Write_rows	1	13700	table_id: # flags: STMT_END_F
+master-bin.000001	13700	Table_map	1	13741	table_id: # (test.t1)
+master-bin.000001	13741	Write_rows	1	13775	table_id: # flags: STMT_END_F
+master-bin.000001	13775	Table_map	1	13816	table_id: # (test.t1)
+master-bin.000001	13816	Write_rows	1	13850	table_id: # flags: STMT_END_F
+master-bin.000001	13850	Table_map	1	13891	table_id: # (test.t1)
+master-bin.000001	13891	Write_rows	1	13925	table_id: # flags: STMT_END_F
+master-bin.000001	13925	Table_map	1	13966	table_id: # (test.t1)
+master-bin.000001	13966	Write_rows	1	14000	table_id: # flags: STMT_END_F
+master-bin.000001	14000	Table_map	1	14041	table_id: # (test.t1)
+master-bin.000001	14041	Write_rows	1	14075	table_id: # flags: STMT_END_F
+master-bin.000001	14075	Table_map	1	14116	table_id: # (test.t1)
+master-bin.000001	14116	Write_rows	1	14150	table_id: # flags: STMT_END_F
+master-bin.000001	14150	Table_map	1	14191	table_id: # (test.t1)
+master-bin.000001	14191	Write_rows	1	14225	table_id: # flags: STMT_END_F
+master-bin.000001	14225	Table_map	1	14266	table_id: # (test.t1)
+master-bin.000001	14266	Write_rows	1	14300	table_id: # flags: STMT_END_F
+master-bin.000001	14300	Table_map	1	14341	table_id: # (test.t1)
+master-bin.000001	14341	Write_rows	1	14375	table_id: # flags: STMT_END_F
+master-bin.000001	14375	Table_map	1	14416	table_id: # (test.t1)
+master-bin.000001	14416	Write_rows	1	14450	table_id: # flags: STMT_END_F
+master-bin.000001	14450	Table_map	1	14491	table_id: # (test.t1)
+master-bin.000001	14491	Write_rows	1	14525	table_id: # flags: STMT_END_F
+master-bin.000001	14525	Table_map	1	14566	table_id: # (test.t1)
+master-bin.000001	14566	Write_rows	1	14600	table_id: # flags: STMT_END_F
+master-bin.000001	14600	Table_map	1	14641	table_id: # (test.t1)
+master-bin.000001	14641	Write_rows	1	14675	table_id: # flags: STMT_END_F
+master-bin.000001	14675	Table_map	1	14716	table_id: # (test.t1)
+master-bin.000001	14716	Write_rows	1	14750	table_id: # flags: STMT_END_F
+master-bin.000001	14750	Table_map	1	14791	table_id: # (test.t1)
+master-bin.000001	14791	Write_rows	1	14825	table_id: # flags: STMT_END_F
+master-bin.000001	14825	Table_map	1	14866	table_id: # (test.t1)
+master-bin.000001	14866	Write_rows	1	14900	table_id: # flags: STMT_END_F
+master-bin.000001	14900	Table_map	1	14941	table_id: # (test.t1)
+master-bin.000001	14941	Write_rows	1	14975	table_id: # flags: STMT_END_F
+master-bin.000001	14975	Table_map	1	15016	table_id: # (test.t1)
+master-bin.000001	15016	Write_rows	1	15050	table_id: # flags: STMT_END_F
+master-bin.000001	15050	Table_map	1	15091	table_id: # (test.t1)
+master-bin.000001	15091	Write_rows	1	15125	table_id: # flags: STMT_END_F
+master-bin.000001	15125	Table_map	1	15166	table_id: # (test.t1)
+master-bin.000001	15166	Write_rows	1	15200	table_id: # flags: STMT_END_F
+master-bin.000001	15200	Table_map	1	15241	table_id: # (test.t1)
+master-bin.000001	15241	Write_rows	1	15275	table_id: # flags: STMT_END_F
+master-bin.000001	15275	Table_map	1	15316	table_id: # (test.t1)
+master-bin.000001	15316	Write_rows	1	15350	table_id: # flags: STMT_END_F
+master-bin.000001	15350	Table_map	1	15391	table_id: # (test.t1)
+master-bin.000001	15391	Write_rows	1	15425	table_id: # flags: STMT_END_F
+master-bin.000001	15425	Table_map	1	15466	table_id: # (test.t1)
+master-bin.000001	15466	Write_rows	1	15500	table_id: # flags: STMT_END_F
+master-bin.000001	15500	Table_map	1	15541	table_id: # (test.t1)
+master-bin.000001	15541	Write_rows	1	15575	table_id: # flags: STMT_END_F
+master-bin.000001	15575	Table_map	1	15616	table_id: # (test.t1)
+master-bin.000001	15616	Write_rows	1	15650	table_id: # flags: STMT_END_F
+master-bin.000001	15650	Table_map	1	15691	table_id: # (test.t1)
+master-bin.000001	15691	Write_rows	1	15725	table_id: # flags: STMT_END_F
+master-bin.000001	15725	Table_map	1	15766	table_id: # (test.t1)
+master-bin.000001	15766	Write_rows	1	15800	table_id: # flags: STMT_END_F
+master-bin.000001	15800	Table_map	1	15841	table_id: # (test.t1)
+master-bin.000001	15841	Write_rows	1	15875	table_id: # flags: STMT_END_F
+master-bin.000001	15875	Table_map	1	15916	table_id: # (test.t1)
+master-bin.000001	15916	Write_rows	1	15950	table_id: # flags: STMT_END_F
+master-bin.000001	15950	Table_map	1	15991	table_id: # (test.t1)
+master-bin.000001	15991	Write_rows	1	16025	table_id: # flags: STMT_END_F
+master-bin.000001	16025	Table_map	1	16066	table_id: # (test.t1)
+master-bin.000001	16066	Write_rows	1	16100	table_id: # flags: STMT_END_F
+master-bin.000001	16100	Table_map	1	16141	table_id: # (test.t1)
+master-bin.000001	16141	Write_rows	1	16175	table_id: # flags: STMT_END_F
+master-bin.000001	16175	Table_map	1	16216	table_id: # (test.t1)
+master-bin.000001	16216	Write_rows	1	16250	table_id: # flags: STMT_END_F
+master-bin.000001	16250	Table_map	1	16291	table_id: # (test.t1)
+master-bin.000001	16291	Write_rows	1	16325	table_id: # flags: STMT_END_F
+master-bin.000001	16325	Table_map	1	16366	table_id: # (test.t1)
+master-bin.000001	16366	Write_rows	1	16400	table_id: # flags: STMT_END_F
+master-bin.000001	16400	Table_map	1	16441	table_id: # (test.t1)
+master-bin.000001	16441	Write_rows	1	16475	table_id: # flags: STMT_END_F
+master-bin.000001	16475	Table_map	1	16516	table_id: # (test.t1)
+master-bin.000001	16516	Write_rows	1	16550	table_id: # flags: STMT_END_F
+master-bin.000001	16550	Table_map	1	16591	table_id: # (test.t1)
+master-bin.000001	16591	Write_rows	1	16625	table_id: # flags: STMT_END_F
+master-bin.000001	16625	Table_map	1	16666	table_id: # (test.t1)
+master-bin.000001	16666	Write_rows	1	16700	table_id: # flags: STMT_END_F
+master-bin.000001	16700	Table_map	1	16741	table_id: # (test.t1)
+master-bin.000001	16741	Write_rows	1	16775	table_id: # flags: STMT_END_F
+master-bin.000001	16775	Table_map	1	16816	table_id: # (test.t1)
+master-bin.000001	16816	Write_rows	1	16850	table_id: # flags: STMT_END_F
+master-bin.000001	16850	Table_map	1	16891	table_id: # (test.t1)
+master-bin.000001	16891	Write_rows	1	16925	table_id: # flags: STMT_END_F
+master-bin.000001	16925	Table_map	1	16966	table_id: # (test.t1)
+master-bin.000001	16966	Write_rows	1	17000	table_id: # flags: STMT_END_F
+master-bin.000001	17000	Table_map	1	17041	table_id: # (test.t1)
+master-bin.000001	17041	Write_rows	1	17075	table_id: # flags: STMT_END_F
+master-bin.000001	17075	Table_map	1	17116	table_id: # (test.t1)
+master-bin.000001	17116	Write_rows	1	17150	table_id: # flags: STMT_END_F
+master-bin.000001	17150	Table_map	1	17191	table_id: # (test.t1)
+master-bin.000001	17191	Write_rows	1	17225	table_id: # flags: STMT_END_F
+master-bin.000001	17225	Table_map	1	17266	table_id: # (test.t1)
+master-bin.000001	17266	Write_rows	1	17300	table_id: # flags: STMT_END_F
+master-bin.000001	17300	Table_map	1	17341	table_id: # (test.t1)
+master-bin.000001	17341	Write_rows	1	17375	table_id: # flags: STMT_END_F
+master-bin.000001	17375	Table_map	1	17416	table_id: # (test.t1)
+master-bin.000001	17416	Write_rows	1	17450	table_id: # flags: STMT_END_F
+master-bin.000001	17450	Table_map	1	17491	table_id: # (test.t1)
+master-bin.000001	17491	Write_rows	1	17525	table_id: # flags: STMT_END_F
+master-bin.000001	17525	Table_map	1	17566	table_id: # (test.t1)
+master-bin.000001	17566	Write_rows	1	17600	table_id: # flags: STMT_END_F
+master-bin.000001	17600	Table_map	1	17641	table_id: # (test.t1)
+master-bin.000001	17641	Write_rows	1	17675	table_id: # flags: STMT_END_F
+master-bin.000001	17675	Table_map	1	17716	table_id: # (test.t1)
+master-bin.000001	17716	Write_rows	1	17750	table_id: # flags: STMT_END_F
+master-bin.000001	17750	Table_map	1	17791	table_id: # (test.t1)
+master-bin.000001	17791	Write_rows	1	17825	table_id: # flags: STMT_END_F
+master-bin.000001	17825	Table_map	1	17866	table_id: # (test.t1)
+master-bin.000001	17866	Write_rows	1	17900	table_id: # flags: STMT_END_F
+master-bin.000001	17900	Table_map	1	17941	table_id: # (test.t1)
+master-bin.000001	17941	Write_rows	1	17975	table_id: # flags: STMT_END_F
+master-bin.000001	17975	Table_map	1	18016	table_id: # (test.t1)
+master-bin.000001	18016	Write_rows	1	18050	table_id: # flags: STMT_END_F
+master-bin.000001	18050	Table_map	1	18091	table_id: # (test.t1)
+master-bin.000001	18091	Write_rows	1	18125	table_id: # flags: STMT_END_F
+master-bin.000001	18125	Table_map	1	18166	table_id: # (test.t1)
+master-bin.000001	18166	Write_rows	1	18200	table_id: # flags: STMT_END_F
+master-bin.000001	18200	Table_map	1	18241	table_id: # (test.t1)
+master-bin.000001	18241	Write_rows	1	18275	table_id: # flags: STMT_END_F
+master-bin.000001	18275	Table_map	1	18316	table_id: # (test.t1)
+master-bin.000001	18316	Write_rows	1	18350	table_id: # flags: STMT_END_F
+master-bin.000001	18350	Table_map	1	18391	table_id: # (test.t1)
+master-bin.000001	18391	Write_rows	1	18425	table_id: # flags: STMT_END_F
+master-bin.000001	18425	Table_map	1	18466	table_id: # (test.t1)
+master-bin.000001	18466	Write_rows	1	18500	table_id: # flags: STMT_END_F
+master-bin.000001	18500	Table_map	1	18541	table_id: # (test.t1)
+master-bin.000001	18541	Write_rows	1	18575	table_id: # flags: STMT_END_F
+master-bin.000001	18575	Table_map	1	18616	table_id: # (test.t1)
+master-bin.000001	18616	Write_rows	1	18650	table_id: # flags: STMT_END_F
+master-bin.000001	18650	Table_map	1	18691	table_id: # (test.t1)
+master-bin.000001	18691	Write_rows	1	18725	table_id: # flags: STMT_END_F
+master-bin.000001	18725	Table_map	1	18766	table_id: # (test.t1)
+master-bin.000001	18766	Write_rows	1	18800	table_id: # flags: STMT_END_F
+master-bin.000001	18800	Table_map	1	18841	table_id: # (test.t1)
+master-bin.000001	18841	Write_rows	1	18875	table_id: # flags: STMT_END_F
+master-bin.000001	18875	Table_map	1	18916	table_id: # (test.t1)
+master-bin.000001	18916	Write_rows	1	18950	table_id: # flags: STMT_END_F
+master-bin.000001	18950	Table_map	1	18991	table_id: # (test.t1)
+master-bin.000001	18991	Write_rows	1	19025	table_id: # flags: STMT_END_F
+master-bin.000001	19025	Table_map	1	19066	table_id: # (test.t1)
+master-bin.000001	19066	Write_rows	1	19100	table_id: # flags: STMT_END_F
+master-bin.000001	19100	Table_map	1	19141	table_id: # (test.t1)
+master-bin.000001	19141	Write_rows	1	19175	table_id: # flags: STMT_END_F
+master-bin.000001	19175	Table_map	1	19216	table_id: # (test.t1)
+master-bin.000001	19216	Write_rows	1	19250	table_id: # flags: STMT_END_F
+master-bin.000001	19250	Table_map	1	19291	table_id: # (test.t1)
+master-bin.000001	19291	Write_rows	1	19325	table_id: # flags: STMT_END_F
+master-bin.000001	19325	Table_map	1	19366	table_id: # (test.t1)
+master-bin.000001	19366	Write_rows	1	19400	table_id: # flags: STMT_END_F
+master-bin.000001	19400	Table_map	1	19441	table_id: # (test.t1)
+master-bin.000001	19441	Write_rows	1	19475	table_id: # flags: STMT_END_F
+master-bin.000001	19475	Table_map	1	19516	table_id: # (test.t1)
+master-bin.000001	19516	Write_rows	1	19550	table_id: # flags: STMT_END_F
+master-bin.000001	19550	Table_map	1	19591	table_id: # (test.t1)
+master-bin.000001	19591	Write_rows	1	19625	table_id: # flags: STMT_END_F
+master-bin.000001	19625	Table_map	1	19666	table_id: # (test.t1)
+master-bin.000001	19666	Write_rows	1	19700	table_id: # flags: STMT_END_F
+master-bin.000001	19700	Table_map	1	19741	table_id: # (test.t1)
+master-bin.000001	19741	Write_rows	1	19775	table_id: # flags: STMT_END_F
+master-bin.000001	19775	Table_map	1	19816	table_id: # (test.t1)
+master-bin.000001	19816	Write_rows	1	19850	table_id: # flags: STMT_END_F
+master-bin.000001	19850	Table_map	1	19891	table_id: # (test.t1)
+master-bin.000001	19891	Write_rows	1	19925	table_id: # flags: STMT_END_F
+master-bin.000001	19925	Table_map	1	19966	table_id: # (test.t1)
+master-bin.000001	19966	Write_rows	1	20000	table_id: # flags: STMT_END_F
+master-bin.000001	20000	Table_map	1	20041	table_id: # (test.t1)
+master-bin.000001	20041	Write_rows	1	20075	table_id: # flags: STMT_END_F
+master-bin.000001	20075	Table_map	1	20116	table_id: # (test.t1)
+master-bin.000001	20116	Write_rows	1	20150	table_id: # flags: STMT_END_F
+master-bin.000001	20150	Table_map	1	20191	table_id: # (test.t1)
+master-bin.000001	20191	Write_rows	1	20225	table_id: # flags: STMT_END_F
+master-bin.000001	20225	Table_map	1	20266	table_id: # (test.t1)
+master-bin.000001	20266	Write_rows	1	20300	table_id: # flags: STMT_END_F
+master-bin.000001	20300	Table_map	1	20341	table_id: # (test.t1)
+master-bin.000001	20341	Write_rows	1	20375	table_id: # flags: STMT_END_F
+master-bin.000001	20375	Table_map	1	20416	table_id: # (test.t1)
+master-bin.000001	20416	Write_rows	1	20450	table_id: # flags: STMT_END_F
+master-bin.000001	20450	Table_map	1	20491	table_id: # (test.t1)
+master-bin.000001	20491	Write_rows	1	20525	table_id: # flags: STMT_END_F
+master-bin.000001	20525	Table_map	1	20566	table_id: # (test.t1)
+master-bin.000001	20566	Write_rows	1	20600	table_id: # flags: STMT_END_F
+master-bin.000001	20600	Table_map	1	20641	table_id: # (test.t1)
+master-bin.000001	20641	Write_rows	1	20675	table_id: # flags: STMT_END_F
+master-bin.000001	20675	Table_map	1	20716	table_id: # (test.t1)
+master-bin.000001	20716	Write_rows	1	20750	table_id: # flags: STMT_END_F
+master-bin.000001	20750	Table_map	1	20791	table_id: # (test.t1)
+master-bin.000001	20791	Write_rows	1	20825	table_id: # flags: STMT_END_F
+master-bin.000001	20825	Table_map	1	20866	table_id: # (test.t1)
+master-bin.000001	20866	Write_rows	1	20900	table_id: # flags: STMT_END_F
+master-bin.000001	20900	Table_map	1	20941	table_id: # (test.t1)
+master-bin.000001	20941	Write_rows	1	20975	table_id: # flags: STMT_END_F
+master-bin.000001	20975	Table_map	1	21016	table_id: # (test.t1)
+master-bin.000001	21016	Write_rows	1	21050	table_id: # flags: STMT_END_F
+master-bin.000001	21050	Table_map	1	21091	table_id: # (test.t1)
+master-bin.000001	21091	Write_rows	1	21125	table_id: # flags: STMT_END_F
+master-bin.000001	21125	Table_map	1	21166	table_id: # (test.t1)
+master-bin.000001	21166	Write_rows	1	21200	table_id: # flags: STMT_END_F
+master-bin.000001	21200	Table_map	1	21241	table_id: # (test.t1)
+master-bin.000001	21241	Write_rows	1	21275	table_id: # flags: STMT_END_F
+master-bin.000001	21275	Table_map	1	21316	table_id: # (test.t1)
+master-bin.000001	21316	Write_rows	1	21350	table_id: # flags: STMT_END_F
+master-bin.000001	21350	Table_map	1	21391	table_id: # (test.t1)
+master-bin.000001	21391	Write_rows	1	21425	table_id: # flags: STMT_END_F
+master-bin.000001	21425	Table_map	1	21466	table_id: # (test.t1)
+master-bin.000001	21466	Write_rows	1	21500	table_id: # flags: STMT_END_F
+master-bin.000001	21500	Table_map	1	21541	table_id: # (test.t1)
+master-bin.000001	21541	Write_rows	1	21575	table_id: # flags: STMT_END_F
+master-bin.000001	21575	Table_map	1	21616	table_id: # (test.t1)
+master-bin.000001	21616	Write_rows	1	21650	table_id: # flags: STMT_END_F
+master-bin.000001	21650	Table_map	1	21691	table_id: # (test.t1)
+master-bin.000001	21691	Write_rows	1	21725	table_id: # flags: STMT_END_F
+master-bin.000001	21725	Table_map	1	21766	table_id: # (test.t1)
+master-bin.000001	21766	Write_rows	1	21800	table_id: # flags: STMT_END_F
+master-bin.000001	21800	Table_map	1	21841	table_id: # (test.t1)
+master-bin.000001	21841	Write_rows	1	21875	table_id: # flags: STMT_END_F
+master-bin.000001	21875	Table_map	1	21916	table_id: # (test.t1)
+master-bin.000001	21916	Write_rows	1	21950	table_id: # flags: STMT_END_F
+master-bin.000001	21950	Table_map	1	21991	table_id: # (test.t1)
+master-bin.000001	21991	Write_rows	1	22025	table_id: # flags: STMT_END_F
+master-bin.000001	22025	Table_map	1	22066	table_id: # (test.t1)
+master-bin.000001	22066	Write_rows	1	22100	table_id: # flags: STMT_END_F
+master-bin.000001	22100	Table_map	1	22141	table_id: # (test.t1)
+master-bin.000001	22141	Write_rows	1	22175	table_id: # flags: STMT_END_F
+master-bin.000001	22175	Table_map	1	22216	table_id: # (test.t1)
+master-bin.000001	22216	Write_rows	1	22250	table_id: # flags: STMT_END_F
+master-bin.000001	22250	Table_map	1	22291	table_id: # (test.t1)
+master-bin.000001	22291	Write_rows	1	22325	table_id: # flags: STMT_END_F
+master-bin.000001	22325	Table_map	1	22366	table_id: # (test.t1)
+master-bin.000001	22366	Write_rows	1	22400	table_id: # flags: STMT_END_F
+master-bin.000001	22400	Table_map	1	22441	table_id: # (test.t1)
+master-bin.000001	22441	Write_rows	1	22475	table_id: # flags: STMT_END_F
+master-bin.000001	22475	Table_map	1	22516	table_id: # (test.t1)
+master-bin.000001	22516	Write_rows	1	22550	table_id: # flags: STMT_END_F
+master-bin.000001	22550	Table_map	1	22591	table_id: # (test.t1)
+master-bin.000001	22591	Write_rows	1	22625	table_id: # flags: STMT_END_F
+master-bin.000001	22625	Table_map	1	22666	table_id: # (test.t1)
+master-bin.000001	22666	Write_rows	1	22700	table_id: # flags: STMT_END_F
+master-bin.000001	22700	Table_map	1	22741	table_id: # (test.t1)
+master-bin.000001	22741	Write_rows	1	22775	table_id: # flags: STMT_END_F
+master-bin.000001	22775	Table_map	1	22816	table_id: # (test.t1)
+master-bin.000001	22816	Write_rows	1	22850	table_id: # flags: STMT_END_F
+master-bin.000001	22850	Table_map	1	22891	table_id: # (test.t1)
+master-bin.000001	22891	Write_rows	1	22925	table_id: # flags: STMT_END_F
+master-bin.000001	22925	Table_map	1	22966	table_id: # (test.t1)
+master-bin.000001	22966	Write_rows	1	23000	table_id: # flags: STMT_END_F
+master-bin.000001	23000	Table_map	1	23041	table_id: # (test.t1)
+master-bin.000001	23041	Write_rows	1	23075	table_id: # flags: STMT_END_F
+master-bin.000001	23075	Table_map	1	23116	table_id: # (test.t1)
+master-bin.000001	23116	Write_rows	1	23150	table_id: # flags: STMT_END_F
+master-bin.000001	23150	Table_map	1	23191	table_id: # (test.t1)
+master-bin.000001	23191	Write_rows	1	23225	table_id: # flags: STMT_END_F
+master-bin.000001	23225	Table_map	1	23266	table_id: # (test.t1)
+master-bin.000001	23266	Write_rows	1	23300	table_id: # flags: STMT_END_F
+master-bin.000001	23300	Table_map	1	23341	table_id: # (test.t1)
+master-bin.000001	23341	Write_rows	1	23375	table_id: # flags: STMT_END_F
+master-bin.000001	23375	Table_map	1	23416	table_id: # (test.t1)
+master-bin.000001	23416	Write_rows	1	23450	table_id: # flags: STMT_END_F
+master-bin.000001	23450	Table_map	1	23491	table_id: # (test.t1)
+master-bin.000001	23491	Write_rows	1	23525	table_id: # flags: STMT_END_F
+master-bin.000001	23525	Table_map	1	23566	table_id: # (test.t1)
+master-bin.000001	23566	Write_rows	1	23600	table_id: # flags: STMT_END_F
+master-bin.000001	23600	Table_map	1	23641	table_id: # (test.t1)
+master-bin.000001	23641	Write_rows	1	23675	table_id: # flags: STMT_END_F
+master-bin.000001	23675	Table_map	1	23716	table_id: # (test.t1)
+master-bin.000001	23716	Write_rows	1	23750	table_id: # flags: STMT_END_F
+master-bin.000001	23750	Table_map	1	23791	table_id: # (test.t1)
+master-bin.000001	23791	Write_rows	1	23825	table_id: # flags: STMT_END_F
+master-bin.000001	23825	Table_map	1	23866	table_id: # (test.t1)
+master-bin.000001	23866	Write_rows	1	23900	table_id: # flags: STMT_END_F
+master-bin.000001	23900	Table_map	1	23941	table_id: # (test.t1)
+master-bin.000001	23941	Write_rows	1	23975	table_id: # flags: STMT_END_F
+master-bin.000001	23975	Table_map	1	24016	table_id: # (test.t1)
+master-bin.000001	24016	Write_rows	1	24050	table_id: # flags: STMT_END_F
+master-bin.000001	24050	Table_map	1	24091	table_id: # (test.t1)
+master-bin.000001	24091	Write_rows	1	24125	table_id: # flags: STMT_END_F
+master-bin.000001	24125	Table_map	1	24166	table_id: # (test.t1)
+master-bin.000001	24166	Write_rows	1	24200	table_id: # flags: STMT_END_F
+master-bin.000001	24200	Table_map	1	24241	table_id: # (test.t1)
+master-bin.000001	24241	Write_rows	1	24275	table_id: # flags: STMT_END_F
+master-bin.000001	24275	Table_map	1	24316	table_id: # (test.t1)
+master-bin.000001	24316	Write_rows	1	24350	table_id: # flags: STMT_END_F
+master-bin.000001	24350	Table_map	1	24391	table_id: # (test.t1)
+master-bin.000001	24391	Write_rows	1	24425	table_id: # flags: STMT_END_F
+master-bin.000001	24425	Table_map	1	24466	table_id: # (test.t1)
+master-bin.000001	24466	Write_rows	1	24500	table_id: # flags: STMT_END_F
+master-bin.000001	24500	Table_map	1	24541	table_id: # (test.t1)
+master-bin.000001	24541	Write_rows	1	24575	table_id: # flags: STMT_END_F
+master-bin.000001	24575	Table_map	1	24616	table_id: # (test.t1)
+master-bin.000001	24616	Write_rows	1	24650	table_id: # flags: STMT_END_F
+master-bin.000001	24650	Table_map	1	24691	table_id: # (test.t1)
+master-bin.000001	24691	Write_rows	1	24725	table_id: # flags: STMT_END_F
+master-bin.000001	24725	Table_map	1	24766	table_id: # (test.t1)
+master-bin.000001	24766	Write_rows	1	24800	table_id: # flags: STMT_END_F
+master-bin.000001	24800	Table_map	1	24841	table_id: # (test.t1)
+master-bin.000001	24841	Write_rows	1	24875	table_id: # flags: STMT_END_F
+master-bin.000001	24875	Table_map	1	24916	table_id: # (test.t1)
+master-bin.000001	24916	Write_rows	1	24950	table_id: # flags: STMT_END_F
+master-bin.000001	24950	Table_map	1	24991	table_id: # (test.t1)
+master-bin.000001	24991	Write_rows	1	25025	table_id: # flags: STMT_END_F
+master-bin.000001	25025	Table_map	1	25066	table_id: # (test.t1)
+master-bin.000001	25066	Write_rows	1	25100	table_id: # flags: STMT_END_F
+master-bin.000001	25100	Table_map	1	25141	table_id: # (test.t1)
+master-bin.000001	25141	Write_rows	1	25175	table_id: # flags: STMT_END_F
+master-bin.000001	25175	Table_map	1	25216	table_id: # (test.t1)
+master-bin.000001	25216	Write_rows	1	25250	table_id: # flags: STMT_END_F
+master-bin.000001	25250	Table_map	1	25291	table_id: # (test.t1)
+master-bin.000001	25291	Write_rows	1	25325	table_id: # flags: STMT_END_F
+master-bin.000001	25325	Table_map	1	25366	table_id: # (test.t1)
+master-bin.000001	25366	Write_rows	1	25400	table_id: # flags: STMT_END_F
+master-bin.000001	25400	Table_map	1	25441	table_id: # (test.t1)
+master-bin.000001	25441	Write_rows	1	25475	table_id: # flags: STMT_END_F
+master-bin.000001	25475	Table_map	1	25516	table_id: # (test.t1)
+master-bin.000001	25516	Write_rows	1	25550	table_id: # flags: STMT_END_F
+master-bin.000001	25550	Table_map	1	25591	table_id: # (test.t1)
+master-bin.000001	25591	Write_rows	1	25625	table_id: # flags: STMT_END_F
+master-bin.000001	25625	Table_map	1	25666	table_id: # (test.t1)
+master-bin.000001	25666	Write_rows	1	25700	table_id: # flags: STMT_END_F
+master-bin.000001	25700	Table_map	1	25741	table_id: # (test.t1)
+master-bin.000001	25741	Write_rows	1	25775	table_id: # flags: STMT_END_F
+master-bin.000001	25775	Table_map	1	25816	table_id: # (test.t1)
+master-bin.000001	25816	Write_rows	1	25850	table_id: # flags: STMT_END_F
+master-bin.000001	25850	Table_map	1	25891	table_id: # (test.t1)
+master-bin.000001	25891	Write_rows	1	25925	table_id: # flags: STMT_END_F
+master-bin.000001	25925	Table_map	1	25966	table_id: # (test.t1)
+master-bin.000001	25966	Write_rows	1	26000	table_id: # flags: STMT_END_F
+master-bin.000001	26000	Table_map	1	26041	table_id: # (test.t1)
+master-bin.000001	26041	Write_rows	1	26075	table_id: # flags: STMT_END_F
+master-bin.000001	26075	Table_map	1	26116	table_id: # (test.t1)
+master-bin.000001	26116	Write_rows	1	26150	table_id: # flags: STMT_END_F
+master-bin.000001	26150	Table_map	1	26191	table_id: # (test.t1)
+master-bin.000001	26191	Write_rows	1	26225	table_id: # flags: STMT_END_F
+master-bin.000001	26225	Table_map	1	26266	table_id: # (test.t1)
+master-bin.000001	26266	Write_rows	1	26300	table_id: # flags: STMT_END_F
+master-bin.000001	26300	Table_map	1	26341	table_id: # (test.t1)
+master-bin.000001	26341	Write_rows	1	26375	table_id: # flags: STMT_END_F
+master-bin.000001	26375	Table_map	1	26416	table_id: # (test.t1)
+master-bin.000001	26416	Write_rows	1	26450	table_id: # flags: STMT_END_F
+master-bin.000001	26450	Table_map	1	26491	table_id: # (test.t1)
+master-bin.000001	26491	Write_rows	1	26525	table_id: # flags: STMT_END_F
+master-bin.000001	26525	Table_map	1	26566	table_id: # (test.t1)
+master-bin.000001	26566	Write_rows	1	26600	table_id: # flags: STMT_END_F
+master-bin.000001	26600	Table_map	1	26641	table_id: # (test.t1)
+master-bin.000001	26641	Write_rows	1	26675	table_id: # flags: STMT_END_F
+master-bin.000001	26675	Table_map	1	26716	table_id: # (test.t1)
+master-bin.000001	26716	Write_rows	1	26750	table_id: # flags: STMT_END_F
+master-bin.000001	26750	Table_map	1	26791	table_id: # (test.t1)
+master-bin.000001	26791	Write_rows	1	26825	table_id: # flags: STMT_END_F
+master-bin.000001	26825	Table_map	1	26866	table_id: # (test.t1)
+master-bin.000001	26866	Write_rows	1	26900	table_id: # flags: STMT_END_F
+master-bin.000001	26900	Table_map	1	26941	table_id: # (test.t1)
+master-bin.000001	26941	Write_rows	1	26975	table_id: # flags: STMT_END_F
+master-bin.000001	26975	Table_map	1	27016	table_id: # (test.t1)
+master-bin.000001	27016	Write_rows	1	27050	table_id: # flags: STMT_END_F
+master-bin.000001	27050	Table_map	1	27091	table_id: # (test.t1)
+master-bin.000001	27091	Write_rows	1	27125	table_id: # flags: STMT_END_F
+master-bin.000001	27125	Table_map	1	27166	table_id: # (test.t1)
+master-bin.000001	27166	Write_rows	1	27200	table_id: # flags: STMT_END_F
+master-bin.000001	27200	Table_map	1	27241	table_id: # (test.t1)
+master-bin.000001	27241	Write_rows	1	27275	table_id: # flags: STMT_END_F
+master-bin.000001	27275	Table_map	1	27316	table_id: # (test.t1)
+master-bin.000001	27316	Write_rows	1	27350	table_id: # flags: STMT_END_F
+master-bin.000001	27350	Table_map	1	27391	table_id: # (test.t1)
+master-bin.000001	27391	Write_rows	1	27425	table_id: # flags: STMT_END_F
+master-bin.000001	27425	Table_map	1	27466	table_id: # (test.t1)
+master-bin.000001	27466	Write_rows	1	27500	table_id: # flags: STMT_END_F
+master-bin.000001	27500	Table_map	1	27541	table_id: # (test.t1)
+master-bin.000001	27541	Write_rows	1	27575	table_id: # flags: STMT_END_F
+master-bin.000001	27575	Table_map	1	27616	table_id: # (test.t1)
+master-bin.000001	27616	Write_rows	1	27650	table_id: # flags: STMT_END_F
+master-bin.000001	27650	Table_map	1	27691	table_id: # (test.t1)
+master-bin.000001	27691	Write_rows	1	27725	table_id: # flags: STMT_END_F
+master-bin.000001	27725	Table_map	1	27766	table_id: # (test.t1)
+master-bin.000001	27766	Write_rows	1	27800	table_id: # flags: STMT_END_F
+master-bin.000001	27800	Table_map	1	27841	table_id: # (test.t1)
+master-bin.000001	27841	Write_rows	1	27875	table_id: # flags: STMT_END_F
+master-bin.000001	27875	Table_map	1	27916	table_id: # (test.t1)
+master-bin.000001	27916	Write_rows	1	27950	table_id: # flags: STMT_END_F
+master-bin.000001	27950	Table_map	1	27991	table_id: # (test.t1)
+master-bin.000001	27991	Write_rows	1	28025	table_id: # flags: STMT_END_F
+master-bin.000001	28025	Table_map	1	28066	table_id: # (test.t1)
+master-bin.000001	28066	Write_rows	1	28100	table_id: # flags: STMT_END_F
+master-bin.000001	28100	Table_map	1	28141	table_id: # (test.t1)
+master-bin.000001	28141	Write_rows	1	28175	table_id: # flags: STMT_END_F
+master-bin.000001	28175	Table_map	1	28216	table_id: # (test.t1)
+master-bin.000001	28216	Write_rows	1	28250	table_id: # flags: STMT_END_F
+master-bin.000001	28250	Table_map	1	28291	table_id: # (test.t1)
+master-bin.000001	28291	Write_rows	1	28325	table_id: # flags: STMT_END_F
+master-bin.000001	28325	Table_map	1	28366	table_id: # (test.t1)
+master-bin.000001	28366	Write_rows	1	28400	table_id: # flags: STMT_END_F
+master-bin.000001	28400	Table_map	1	28441	table_id: # (test.t1)
+master-bin.000001	28441	Write_rows	1	28475	table_id: # flags: STMT_END_F
+master-bin.000001	28475	Table_map	1	28516	table_id: # (test.t1)
+master-bin.000001	28516	Write_rows	1	28550	table_id: # flags: STMT_END_F
+master-bin.000001	28550	Table_map	1	28591	table_id: # (test.t1)
+master-bin.000001	28591	Write_rows	1	28625	table_id: # flags: STMT_END_F
+master-bin.000001	28625	Table_map	1	28666	table_id: # (test.t1)
+master-bin.000001	28666	Write_rows	1	28700	table_id: # flags: STMT_END_F
+master-bin.000001	28700	Table_map	1	28741	table_id: # (test.t1)
+master-bin.000001	28741	Write_rows	1	28775	table_id: # flags: STMT_END_F
+master-bin.000001	28775	Table_map	1	28816	table_id: # (test.t1)
+master-bin.000001	28816	Write_rows	1	28850	table_id: # flags: STMT_END_F
+master-bin.000001	28850	Table_map	1	28891	table_id: # (test.t1)
+master-bin.000001	28891	Write_rows	1	28925	table_id: # flags: STMT_END_F
+master-bin.000001	28925	Table_map	1	28966	table_id: # (test.t1)
+master-bin.000001	28966	Write_rows	1	29000	table_id: # flags: STMT_END_F
+master-bin.000001	29000	Table_map	1	29041	table_id: # (test.t1)
+master-bin.000001	29041	Write_rows	1	29075	table_id: # flags: STMT_END_F
+master-bin.000001	29075	Table_map	1	29116	table_id: # (test.t1)
+master-bin.000001	29116	Write_rows	1	29150	table_id: # flags: STMT_END_F
+master-bin.000001	29150	Table_map	1	29191	table_id: # (test.t1)
+master-bin.000001	29191	Write_rows	1	29225	table_id: # flags: STMT_END_F
+master-bin.000001	29225	Table_map	1	29266	table_id: # (test.t1)
+master-bin.000001	29266	Write_rows	1	29300	table_id: # flags: STMT_END_F
+master-bin.000001	29300	Table_map	1	29341	table_id: # (test.t1)
+master-bin.000001	29341	Write_rows	1	29375	table_id: # flags: STMT_END_F
+master-bin.000001	29375	Table_map	1	29416	table_id: # (test.t1)
+master-bin.000001	29416	Write_rows	1	29450	table_id: # flags: STMT_END_F
+master-bin.000001	29450	Table_map	1	29491	table_id: # (test.t1)
+master-bin.000001	29491	Write_rows	1	29525	table_id: # flags: STMT_END_F
+master-bin.000001	29525	Table_map	1	29566	table_id: # (test.t1)
+master-bin.000001	29566	Write_rows	1	29600	table_id: # flags: STMT_END_F
+master-bin.000001	29600	Table_map	1	29641	table_id: # (test.t1)
+master-bin.000001	29641	Write_rows	1	29675	table_id: # flags: STMT_END_F
+master-bin.000001	29675	Table_map	1	29716	table_id: # (test.t1)
+master-bin.000001	29716	Write_rows	1	29750	table_id: # flags: STMT_END_F
+master-bin.000001	29750	Table_map	1	29791	table_id: # (test.t1)
+master-bin.000001	29791	Write_rows	1	29825	table_id: # flags: STMT_END_F
+master-bin.000001	29825	Table_map	1	29866	table_id: # (test.t1)
+master-bin.000001	29866	Write_rows	1	29900	table_id: # flags: STMT_END_F
+master-bin.000001	29900	Table_map	1	29941	table_id: # (test.t1)
+master-bin.000001	29941	Write_rows	1	29975	table_id: # flags: STMT_END_F
+master-bin.000001	29975	Table_map	1	30016	table_id: # (test.t1)
+master-bin.000001	30016	Write_rows	1	30050	table_id: # flags: STMT_END_F
+master-bin.000001	30050	Table_map	1	30091	table_id: # (test.t1)
+master-bin.000001	30091	Write_rows	1	30125	table_id: # flags: STMT_END_F
+master-bin.000001	30125	Table_map	1	30166	table_id: # (test.t1)
+master-bin.000001	30166	Write_rows	1	30200	table_id: # flags: STMT_END_F
+master-bin.000001	30200	Table_map	1	30241	table_id: # (test.t1)
+master-bin.000001	30241	Write_rows	1	30275	table_id: # flags: STMT_END_F
+master-bin.000001	30275	Xid	1	30302	COMMIT /* XID */
+master-bin.000001	30302	Rotate	1	30346	master-bin.000002;pos=4
 drop table t1;
 set global binlog_cache_size=@bcs;
 set session autocommit = @ac;
@@ -1166,12 +1166,12 @@ drop table if exists t3;
 create table t3 (a int(11) NOT NULL AUTO_INCREMENT, b text, PRIMARY KEY (a) ) engine=innodb;
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	346		
+master-bin.000001	347		
 insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
 aaaaaaaaaaaaaaaaaaaaaaa');
 insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
 aaaaaaaaaaaaaaaaaaaaaaa');
 insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
 aaaaaaaaaaaaaaaaaaaaaaa');
 insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
 aaaaaaaaaaaaaaaaaaaaaaa');
 show master status /* must show new binlog index after rotating */;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000002	106		
+master-bin.000002	107		
 drop table t3;
diff -Nrup a/mysql-test/suite/binlog/r/binlog_stm_binlog.result b/mysql-test/suite/binlog/r/binlog_stm_binlog.result
--- a/mysql-test/suite/binlog/r/binlog_stm_binlog.result	2007-07-10 18:31:06 +02:00
+++ b/mysql-test/suite/binlog/r/binlog_stm_binlog.result	2007-10-13 22:40:57 +02:00
@@ -4,11 +4,11 @@ insert into t1 values (1,2);
 commit;
 show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	4	Format_desc	1	106	Server ver: #, Binlog ver: #
-master-bin.000001	106	Query	1	213	use `test`; create table t1 (a int, b int) engine=innodb
-master-bin.000001	213	Query	1	281	use `test`; BEGIN
-master-bin.000001	281	Query	1	371	use `test`; insert into t1 values (1,2)
-master-bin.000001	371	Xid	1	398	COMMIT /* XID */
+master-bin.000001	4	Format_desc	1	107	Server ver: #, Binlog ver: #
+master-bin.000001	107	Query	1	214	use `test`; create table t1 (a int, b int) engine=innodb
+master-bin.000001	214	Query	1	282	use `test`; BEGIN
+master-bin.000001	282	Query	1	372	use `test`; insert into t1 values (1,2)
+master-bin.000001	372	Xid	1	399	COMMIT /* XID */
 drop table t1;
 drop table if exists t1, t2;
 reset master;
@@ -36,7 +36,7 @@ create table t1 (n int) engine=innodb;
 begin;
 commit;
 drop table t1;
-show binlog events in 'master-bin.000001' from 106;
+show binlog events in 'master-bin.000001' from 107;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	1	#	use `test`; create table t1 (n int) engine=innodb
 master-bin.000001	#	Query	1	#	use `test`; BEGIN
@@ -142,7 +142,7 @@ master-bin.000001	#	Query	1	#	use `test`
 master-bin.000001	#	Query	1	#	use `test`; insert into t1 values(1 + 4)
 master-bin.000001	#	Xid	1	#	COMMIT /* xid= */
 master-bin.000001	#	Rotate	1	#	master-bin.000002;pos=4
-show binlog events in 'master-bin.000002' from 106;
+show binlog events in 'master-bin.000002' from 107;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000002	#	Query	1	#	use `test`; drop table t1
 set @ac = @@autocommit;
@@ -157,425 +157,425 @@ commit;
 drop table t1;
 show binlog events from 0;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	4	Format_desc	1	106	Server version, Binlog ver: 4
-master-bin.000001	106	Query	1	205	use `test`; create table t1(n int) engine=innodb
-master-bin.000001	205	Query	1	273	use `test`; BEGIN
-master-bin.000001	273	Query	1	361	use `test`; insert into t1 values (1)
-master-bin.000001	361	Query	1	449	use `test`; insert into t1 values (2)
-master-bin.000001	449	Query	1	537	use `test`; insert into t1 values (3)
-master-bin.000001	537	Xid	1	564	COMMIT /* XID */
-master-bin.000001	564	Query	1	640	use `test`; drop table t1
+master-bin.000001	4	Format_desc	1	107	Server version, Binlog ver: 4
+master-bin.000001	107	Query	1	206	use `test`; create table t1(n int) engine=innodb
+master-bin.000001	206	Query	1	274	use `test`; BEGIN
+master-bin.000001	274	Query	1	362	use `test`; insert into t1 values (1)
+master-bin.000001	362	Query	1	450	use `test`; insert into t1 values (2)
+master-bin.000001	450	Query	1	538	use `test`; insert into t1 values (3)
+master-bin.000001	538	Xid	1	565	COMMIT /* XID */
+master-bin.000001	565	Query	1	641	use `test`; drop table t1
 set @bcs = @@binlog_cache_size;
 set global binlog_cache_size=4096;
 reset master;
 create table t1 (a int) engine=innodb;
 show binlog events from 0;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	4	Format_desc	1	106	Server version, Binlog ver: 4
-master-bin.000001	106	Query	1	206	use `test`; create table t1 (a int) engine=innodb
-master-bin.000001	206	Query	1	274	use `test`; BEGIN
-master-bin.000001	274	Query	1	365	use `test`; insert into t1 values( 400 )
-master-bin.000001	365	Query	1	456	use `test`; insert into t1 values( 399 )
-master-bin.000001	456	Query	1	547	use `test`; insert into t1 values( 398 )
-master-bin.000001	547	Query	1	638	use `test`; insert into t1 values( 397 )
-master-bin.000001	638	Query	1	729	use `test`; insert into t1 values( 396 )
-master-bin.000001	729	Query	1	820	use `test`; insert into t1 values( 395 )
-master-bin.000001	820	Query	1	911	use `test`; insert into t1 values( 394 )
-master-bin.000001	911	Query	1	1002	use `test`; insert into t1 values( 393 )
-master-bin.000001	1002	Query	1	1093	use `test`; insert into t1 values( 392 )
-master-bin.000001	1093	Query	1	1184	use `test`; insert into t1 values( 391 )
-master-bin.000001	1184	Query	1	1275	use `test`; insert into t1 values( 390 )
-master-bin.000001	1275	Query	1	1366	use `test`; insert into t1 values( 389 )
-master-bin.000001	1366	Query	1	1457	use `test`; insert into t1 values( 388 )
-master-bin.000001	1457	Query	1	1548	use `test`; insert into t1 values( 387 )
-master-bin.000001	1548	Query	1	1639	use `test`; insert into t1 values( 386 )
-master-bin.000001	1639	Query	1	1730	use `test`; insert into t1 values( 385 )
-master-bin.000001	1730	Query	1	1821	use `test`; insert into t1 values( 384 )
-master-bin.000001	1821	Query	1	1912	use `test`; insert into t1 values( 383 )
-master-bin.000001	1912	Query	1	2003	use `test`; insert into t1 values( 382 )
-master-bin.000001	2003	Query	1	2094	use `test`; insert into t1 values( 381 )
-master-bin.000001	2094	Query	1	2185	use `test`; insert into t1 values( 380 )
-master-bin.000001	2185	Query	1	2276	use `test`; insert into t1 values( 379 )
-master-bin.000001	2276	Query	1	2367	use `test`; insert into t1 values( 378 )
-master-bin.000001	2367	Query	1	2458	use `test`; insert into t1 values( 377 )
-master-bin.000001	2458	Query	1	2549	use `test`; insert into t1 values( 376 )
-master-bin.000001	2549	Query	1	2640	use `test`; insert into t1 values( 375 )
-master-bin.000001	2640	Query	1	2731	use `test`; insert into t1 values( 374 )
-master-bin.000001	2731	Query	1	2822	use `test`; insert into t1 values( 373 )
-master-bin.000001	2822	Query	1	2913	use `test`; insert into t1 values( 372 )
-master-bin.000001	2913	Query	1	3004	use `test`; insert into t1 values( 371 )
-master-bin.000001	3004	Query	1	3095	use `test`; insert into t1 values( 370 )
-master-bin.000001	3095	Query	1	3186	use `test`; insert into t1 values( 369 )
-master-bin.000001	3186	Query	1	3277	use `test`; insert into t1 values( 368 )
-master-bin.000001	3277	Query	1	3368	use `test`; insert into t1 values( 367 )
-master-bin.000001	3368	Query	1	3459	use `test`; insert into t1 values( 366 )
-master-bin.000001	3459	Query	1	3550	use `test`; insert into t1 values( 365 )
-master-bin.000001	3550	Query	1	3641	use `test`; insert into t1 values( 364 )
-master-bin.000001	3641	Query	1	3732	use `test`; insert into t1 values( 363 )
-master-bin.000001	3732	Query	1	3823	use `test`; insert into t1 values( 362 )
-master-bin.000001	3823	Query	1	3914	use `test`; insert into t1 values( 361 )
-master-bin.000001	3914	Query	1	4005	use `test`; insert into t1 values( 360 )
-master-bin.000001	4005	Query	1	4096	use `test`; insert into t1 values( 359 )
-master-bin.000001	4096	Query	1	4187	use `test`; insert into t1 values( 358 )
-master-bin.000001	4187	Query	1	4278	use `test`; insert into t1 values( 357 )
-master-bin.000001	4278	Query	1	4369	use `test`; insert into t1 values( 356 )
-master-bin.000001	4369	Query	1	4460	use `test`; insert into t1 values( 355 )
-master-bin.000001	4460	Query	1	4551	use `test`; insert into t1 values( 354 )
-master-bin.000001	4551	Query	1	4642	use `test`; insert into t1 values( 353 )
-master-bin.000001	4642	Query	1	4733	use `test`; insert into t1 values( 352 )
-master-bin.000001	4733	Query	1	4824	use `test`; insert into t1 values( 351 )
-master-bin.000001	4824	Query	1	4915	use `test`; insert into t1 values( 350 )
-master-bin.000001	4915	Query	1	5006	use `test`; insert into t1 values( 349 )
-master-bin.000001	5006	Query	1	5097	use `test`; insert into t1 values( 348 )
-master-bin.000001	5097	Query	1	5188	use `test`; insert into t1 values( 347 )
-master-bin.000001	5188	Query	1	5279	use `test`; insert into t1 values( 346 )
-master-bin.000001	5279	Query	1	5370	use `test`; insert into t1 values( 345 )
-master-bin.000001	5370	Query	1	5461	use `test`; insert into t1 values( 344 )
-master-bin.000001	5461	Query	1	5552	use `test`; insert into t1 values( 343 )
-master-bin.000001	5552	Query	1	5643	use `test`; insert into t1 values( 342 )
-master-bin.000001	5643	Query	1	5734	use `test`; insert into t1 values( 341 )
-master-bin.000001	5734	Query	1	5825	use `test`; insert into t1 values( 340 )
-master-bin.000001	5825	Query	1	5916	use `test`; insert into t1 values( 339 )
-master-bin.000001	5916	Query	1	6007	use `test`; insert into t1 values( 338 )
-master-bin.000001	6007	Query	1	6098	use `test`; insert into t1 values( 337 )
-master-bin.000001	6098	Query	1	6189	use `test`; insert into t1 values( 336 )
-master-bin.000001	6189	Query	1	6280	use `test`; insert into t1 values( 335 )
-master-bin.000001	6280	Query	1	6371	use `test`; insert into t1 values( 334 )
-master-bin.000001	6371	Query	1	6462	use `test`; insert into t1 values( 333 )
-master-bin.000001	6462	Query	1	6553	use `test`; insert into t1 values( 332 )
-master-bin.000001	6553	Query	1	6644	use `test`; insert into t1 values( 331 )
-master-bin.000001	6644	Query	1	6735	use `test`; insert into t1 values( 330 )
-master-bin.000001	6735	Query	1	6826	use `test`; insert into t1 values( 329 )
-master-bin.000001	6826	Query	1	6917	use `test`; insert into t1 values( 328 )
-master-bin.000001	6917	Query	1	7008	use `test`; insert into t1 values( 327 )
-master-bin.000001	7008	Query	1	7099	use `test`; insert into t1 values( 326 )
-master-bin.000001	7099	Query	1	7190	use `test`; insert into t1 values( 325 )
-master-bin.000001	7190	Query	1	7281	use `test`; insert into t1 values( 324 )
-master-bin.000001	7281	Query	1	7372	use `test`; insert into t1 values( 323 )
-master-bin.000001	7372	Query	1	7463	use `test`; insert into t1 values( 322 )
-master-bin.000001	7463	Query	1	7554	use `test`; insert into t1 values( 321 )
-master-bin.000001	7554	Query	1	7645	use `test`; insert into t1 values( 320 )
-master-bin.000001	7645	Query	1	7736	use `test`; insert into t1 values( 319 )
-master-bin.000001	7736	Query	1	7827	use `test`; insert into t1 values( 318 )
-master-bin.000001	7827	Query	1	7918	use `test`; insert into t1 values( 317 )
-master-bin.000001	7918	Query	1	8009	use `test`; insert into t1 values( 316 )
-master-bin.000001	8009	Query	1	8100	use `test`; insert into t1 values( 315 )
-master-bin.000001	8100	Query	1	8191	use `test`; insert into t1 values( 314 )
-master-bin.000001	8191	Query	1	8282	use `test`; insert into t1 values( 313 )
-master-bin.000001	8282	Query	1	8373	use `test`; insert into t1 values( 312 )
-master-bin.000001	8373	Query	1	8464	use `test`; insert into t1 values( 311 )
-master-bin.000001	8464	Query	1	8555	use `test`; insert into t1 values( 310 )
-master-bin.000001	8555	Query	1	8646	use `test`; insert into t1 values( 309 )
-master-bin.000001	8646	Query	1	8737	use `test`; insert into t1 values( 308 )
-master-bin.000001	8737	Query	1	8828	use `test`; insert into t1 values( 307 )
-master-bin.000001	8828	Query	1	8919	use `test`; insert into t1 values( 306 )
-master-bin.000001	8919	Query	1	9010	use `test`; insert into t1 values( 305 )
-master-bin.000001	9010	Query	1	9101	use `test`; insert into t1 values( 304 )
-master-bin.000001	9101	Query	1	9192	use `test`; insert into t1 values( 303 )
-master-bin.000001	9192	Query	1	9283	use `test`; insert into t1 values( 302 )
-master-bin.000001	9283	Query	1	9374	use `test`; insert into t1 values( 301 )
-master-bin.000001	9374	Query	1	9465	use `test`; insert into t1 values( 300 )
-master-bin.000001	9465	Query	1	9556	use `test`; insert into t1 values( 299 )
-master-bin.000001	9556	Query	1	9647	use `test`; insert into t1 values( 298 )
-master-bin.000001	9647	Query	1	9738	use `test`; insert into t1 values( 297 )
-master-bin.000001	9738	Query	1	9829	use `test`; insert into t1 values( 296 )
-master-bin.000001	9829	Query	1	9920	use `test`; insert into t1 values( 295 )
-master-bin.000001	9920	Query	1	10011	use `test`; insert into t1 values( 294 )
-master-bin.000001	10011	Query	1	10102	use `test`; insert into t1 values( 293 )
-master-bin.000001	10102	Query	1	10193	use `test`; insert into t1 values( 292 )
-master-bin.000001	10193	Query	1	10284	use `test`; insert into t1 values( 291 )
-master-bin.000001	10284	Query	1	10375	use `test`; insert into t1 values( 290 )
-master-bin.000001	10375	Query	1	10466	use `test`; insert into t1 values( 289 )
-master-bin.000001	10466	Query	1	10557	use `test`; insert into t1 values( 288 )
-master-bin.000001	10557	Query	1	10648	use `test`; insert into t1 values( 287 )
-master-bin.000001	10648	Query	1	10739	use `test`; insert into t1 values( 286 )
-master-bin.000001	10739	Query	1	10830	use `test`; insert into t1 values( 285 )
-master-bin.000001	10830	Query	1	10921	use `test`; insert into t1 values( 284 )
-master-bin.000001	10921	Query	1	11012	use `test`; insert into t1 values( 283 )
-master-bin.000001	11012	Query	1	11103	use `test`; insert into t1 values( 282 )
-master-bin.000001	11103	Query	1	11194	use `test`; insert into t1 values( 281 )
-master-bin.000001	11194	Query	1	11285	use `test`; insert into t1 values( 280 )
-master-bin.000001	11285	Query	1	11376	use `test`; insert into t1 values( 279 )
-master-bin.000001	11376	Query	1	11467	use `test`; insert into t1 values( 278 )
-master-bin.000001	11467	Query	1	11558	use `test`; insert into t1 values( 277 )
-master-bin.000001	11558	Query	1	11649	use `test`; insert into t1 values( 276 )
-master-bin.000001	11649	Query	1	11740	use `test`; insert into t1 values( 275 )
-master-bin.000001	11740	Query	1	11831	use `test`; insert into t1 values( 274 )
-master-bin.000001	11831	Query	1	11922	use `test`; insert into t1 values( 273 )
-master-bin.000001	11922	Query	1	12013	use `test`; insert into t1 values( 272 )
-master-bin.000001	12013	Query	1	12104	use `test`; insert into t1 values( 271 )
-master-bin.000001	12104	Query	1	12195	use `test`; insert into t1 values( 270 )
-master-bin.000001	12195	Query	1	12286	use `test`; insert into t1 values( 269 )
-master-bin.000001	12286	Query	1	12377	use `test`; insert into t1 values( 268 )
-master-bin.000001	12377	Query	1	12468	use `test`; insert into t1 values( 267 )
-master-bin.000001	12468	Query	1	12559	use `test`; insert into t1 values( 266 )
-master-bin.000001	12559	Query	1	12650	use `test`; insert into t1 values( 265 )
-master-bin.000001	12650	Query	1	12741	use `test`; insert into t1 values( 264 )
-master-bin.000001	12741	Query	1	12832	use `test`; insert into t1 values( 263 )
-master-bin.000001	12832	Query	1	12923	use `test`; insert into t1 values( 262 )
-master-bin.000001	12923	Query	1	13014	use `test`; insert into t1 values( 261 )
-master-bin.000001	13014	Query	1	13105	use `test`; insert into t1 values( 260 )
-master-bin.000001	13105	Query	1	13196	use `test`; insert into t1 values( 259 )
-master-bin.000001	13196	Query	1	13287	use `test`; insert into t1 values( 258 )
-master-bin.000001	13287	Query	1	13378	use `test`; insert into t1 values( 257 )
-master-bin.000001	13378	Query	1	13469	use `test`; insert into t1 values( 256 )
-master-bin.000001	13469	Query	1	13560	use `test`; insert into t1 values( 255 )
-master-bin.000001	13560	Query	1	13651	use `test`; insert into t1 values( 254 )
-master-bin.000001	13651	Query	1	13742	use `test`; insert into t1 values( 253 )
-master-bin.000001	13742	Query	1	13833	use `test`; insert into t1 values( 252 )
-master-bin.000001	13833	Query	1	13924	use `test`; insert into t1 values( 251 )
-master-bin.000001	13924	Query	1	14015	use `test`; insert into t1 values( 250 )
-master-bin.000001	14015	Query	1	14106	use `test`; insert into t1 values( 249 )
-master-bin.000001	14106	Query	1	14197	use `test`; insert into t1 values( 248 )
-master-bin.000001	14197	Query	1	14288	use `test`; insert into t1 values( 247 )
-master-bin.000001	14288	Query	1	14379	use `test`; insert into t1 values( 246 )
-master-bin.000001	14379	Query	1	14470	use `test`; insert into t1 values( 245 )
-master-bin.000001	14470	Query	1	14561	use `test`; insert into t1 values( 244 )
-master-bin.000001	14561	Query	1	14652	use `test`; insert into t1 values( 243 )
-master-bin.000001	14652	Query	1	14743	use `test`; insert into t1 values( 242 )
-master-bin.000001	14743	Query	1	14834	use `test`; insert into t1 values( 241 )
-master-bin.000001	14834	Query	1	14925	use `test`; insert into t1 values( 240 )
-master-bin.000001	14925	Query	1	15016	use `test`; insert into t1 values( 239 )
-master-bin.000001	15016	Query	1	15107	use `test`; insert into t1 values( 238 )
-master-bin.000001	15107	Query	1	15198	use `test`; insert into t1 values( 237 )
-master-bin.000001	15198	Query	1	15289	use `test`; insert into t1 values( 236 )
-master-bin.000001	15289	Query	1	15380	use `test`; insert into t1 values( 235 )
-master-bin.000001	15380	Query	1	15471	use `test`; insert into t1 values( 234 )
-master-bin.000001	15471	Query	1	15562	use `test`; insert into t1 values( 233 )
-master-bin.000001	15562	Query	1	15653	use `test`; insert into t1 values( 232 )
-master-bin.000001	15653	Query	1	15744	use `test`; insert into t1 values( 231 )
-master-bin.000001	15744	Query	1	15835	use `test`; insert into t1 values( 230 )
-master-bin.000001	15835	Query	1	15926	use `test`; insert into t1 values( 229 )
-master-bin.000001	15926	Query	1	16017	use `test`; insert into t1 values( 228 )
-master-bin.000001	16017	Query	1	16108	use `test`; insert into t1 values( 227 )
-master-bin.000001	16108	Query	1	16199	use `test`; insert into t1 values( 226 )
-master-bin.000001	16199	Query	1	16290	use `test`; insert into t1 values( 225 )
-master-bin.000001	16290	Query	1	16381	use `test`; insert into t1 values( 224 )
-master-bin.000001	16381	Query	1	16472	use `test`; insert into t1 values( 223 )
-master-bin.000001	16472	Query	1	16563	use `test`; insert into t1 values( 222 )
-master-bin.000001	16563	Query	1	16654	use `test`; insert into t1 values( 221 )
-master-bin.000001	16654	Query	1	16745	use `test`; insert into t1 values( 220 )
-master-bin.000001	16745	Query	1	16836	use `test`; insert into t1 values( 219 )
-master-bin.000001	16836	Query	1	16927	use `test`; insert into t1 values( 218 )
-master-bin.000001	16927	Query	1	17018	use `test`; insert into t1 values( 217 )
-master-bin.000001	17018	Query	1	17109	use `test`; insert into t1 values( 216 )
-master-bin.000001	17109	Query	1	17200	use `test`; insert into t1 values( 215 )
-master-bin.000001	17200	Query	1	17291	use `test`; insert into t1 values( 214 )
-master-bin.000001	17291	Query	1	17382	use `test`; insert into t1 values( 213 )
-master-bin.000001	17382	Query	1	17473	use `test`; insert into t1 values( 212 )
-master-bin.000001	17473	Query	1	17564	use `test`; insert into t1 values( 211 )
-master-bin.000001	17564	Query	1	17655	use `test`; insert into t1 values( 210 )
-master-bin.000001	17655	Query	1	17746	use `test`; insert into t1 values( 209 )
-master-bin.000001	17746	Query	1	17837	use `test`; insert into t1 values( 208 )
-master-bin.000001	17837	Query	1	17928	use `test`; insert into t1 values( 207 )
-master-bin.000001	17928	Query	1	18019	use `test`; insert into t1 values( 206 )
-master-bin.000001	18019	Query	1	18110	use `test`; insert into t1 values( 205 )
-master-bin.000001	18110	Query	1	18201	use `test`; insert into t1 values( 204 )
-master-bin.000001	18201	Query	1	18292	use `test`; insert into t1 values( 203 )
-master-bin.000001	18292	Query	1	18383	use `test`; insert into t1 values( 202 )
-master-bin.000001	18383	Query	1	18474	use `test`; insert into t1 values( 201 )
-master-bin.000001	18474	Query	1	18565	use `test`; insert into t1 values( 200 )
-master-bin.000001	18565	Query	1	18656	use `test`; insert into t1 values( 199 )
-master-bin.000001	18656	Query	1	18747	use `test`; insert into t1 values( 198 )
-master-bin.000001	18747	Query	1	18838	use `test`; insert into t1 values( 197 )
-master-bin.000001	18838	Query	1	18929	use `test`; insert into t1 values( 196 )
-master-bin.000001	18929	Query	1	19020	use `test`; insert into t1 values( 195 )
-master-bin.000001	19020	Query	1	19111	use `test`; insert into t1 values( 194 )
-master-bin.000001	19111	Query	1	19202	use `test`; insert into t1 values( 193 )
-master-bin.000001	19202	Query	1	19293	use `test`; insert into t1 values( 192 )
-master-bin.000001	19293	Query	1	19384	use `test`; insert into t1 values( 191 )
-master-bin.000001	19384	Query	1	19475	use `test`; insert into t1 values( 190 )
-master-bin.000001	19475	Query	1	19566	use `test`; insert into t1 values( 189 )
-master-bin.000001	19566	Query	1	19657	use `test`; insert into t1 values( 188 )
-master-bin.000001	19657	Query	1	19748	use `test`; insert into t1 values( 187 )
-master-bin.000001	19748	Query	1	19839	use `test`; insert into t1 values( 186 )
-master-bin.000001	19839	Query	1	19930	use `test`; insert into t1 values( 185 )
-master-bin.000001	19930	Query	1	20021	use `test`; insert into t1 values( 184 )
-master-bin.000001	20021	Query	1	20112	use `test`; insert into t1 values( 183 )
-master-bin.000001	20112	Query	1	20203	use `test`; insert into t1 values( 182 )
-master-bin.000001	20203	Query	1	20294	use `test`; insert into t1 values( 181 )
-master-bin.000001	20294	Query	1	20385	use `test`; insert into t1 values( 180 )
-master-bin.000001	20385	Query	1	20476	use `test`; insert into t1 values( 179 )
-master-bin.000001	20476	Query	1	20567	use `test`; insert into t1 values( 178 )
-master-bin.000001	20567	Query	1	20658	use `test`; insert into t1 values( 177 )
-master-bin.000001	20658	Query	1	20749	use `test`; insert into t1 values( 176 )
-master-bin.000001	20749	Query	1	20840	use `test`; insert into t1 values( 175 )
-master-bin.000001	20840	Query	1	20931	use `test`; insert into t1 values( 174 )
-master-bin.000001	20931	Query	1	21022	use `test`; insert into t1 values( 173 )
-master-bin.000001	21022	Query	1	21113	use `test`; insert into t1 values( 172 )
-master-bin.000001	21113	Query	1	21204	use `test`; insert into t1 values( 171 )
-master-bin.000001	21204	Query	1	21295	use `test`; insert into t1 values( 170 )
-master-bin.000001	21295	Query	1	21386	use `test`; insert into t1 values( 169 )
-master-bin.000001	21386	Query	1	21477	use `test`; insert into t1 values( 168 )
-master-bin.000001	21477	Query	1	21568	use `test`; insert into t1 values( 167 )
-master-bin.000001	21568	Query	1	21659	use `test`; insert into t1 values( 166 )
-master-bin.000001	21659	Query	1	21750	use `test`; insert into t1 values( 165 )
-master-bin.000001	21750	Query	1	21841	use `test`; insert into t1 values( 164 )
-master-bin.000001	21841	Query	1	21932	use `test`; insert into t1 values( 163 )
-master-bin.000001	21932	Query	1	22023	use `test`; insert into t1 values( 162 )
-master-bin.000001	22023	Query	1	22114	use `test`; insert into t1 values( 161 )
-master-bin.000001	22114	Query	1	22205	use `test`; insert into t1 values( 160 )
-master-bin.000001	22205	Query	1	22296	use `test`; insert into t1 values( 159 )
-master-bin.000001	22296	Query	1	22387	use `test`; insert into t1 values( 158 )
-master-bin.000001	22387	Query	1	22478	use `test`; insert into t1 values( 157 )
-master-bin.000001	22478	Query	1	22569	use `test`; insert into t1 values( 156 )
-master-bin.000001	22569	Query	1	22660	use `test`; insert into t1 values( 155 )
-master-bin.000001	22660	Query	1	22751	use `test`; insert into t1 values( 154 )
-master-bin.000001	22751	Query	1	22842	use `test`; insert into t1 values( 153 )
-master-bin.000001	22842	Query	1	22933	use `test`; insert into t1 values( 152 )
-master-bin.000001	22933	Query	1	23024	use `test`; insert into t1 values( 151 )
-master-bin.000001	23024	Query	1	23115	use `test`; insert into t1 values( 150 )
-master-bin.000001	23115	Query	1	23206	use `test`; insert into t1 values( 149 )
-master-bin.000001	23206	Query	1	23297	use `test`; insert into t1 values( 148 )
-master-bin.000001	23297	Query	1	23388	use `test`; insert into t1 values( 147 )
-master-bin.000001	23388	Query	1	23479	use `test`; insert into t1 values( 146 )
-master-bin.000001	23479	Query	1	23570	use `test`; insert into t1 values( 145 )
-master-bin.000001	23570	Query	1	23661	use `test`; insert into t1 values( 144 )
-master-bin.000001	23661	Query	1	23752	use `test`; insert into t1 values( 143 )
-master-bin.000001	23752	Query	1	23843	use `test`; insert into t1 values( 142 )
-master-bin.000001	23843	Query	1	23934	use `test`; insert into t1 values( 141 )
-master-bin.000001	23934	Query	1	24025	use `test`; insert into t1 values( 140 )
-master-bin.000001	24025	Query	1	24116	use `test`; insert into t1 values( 139 )
-master-bin.000001	24116	Query	1	24207	use `test`; insert into t1 values( 138 )
-master-bin.000001	24207	Query	1	24298	use `test`; insert into t1 values( 137 )
-master-bin.000001	24298	Query	1	24389	use `test`; insert into t1 values( 136 )
-master-bin.000001	24389	Query	1	24480	use `test`; insert into t1 values( 135 )
-master-bin.000001	24480	Query	1	24571	use `test`; insert into t1 values( 134 )
-master-bin.000001	24571	Query	1	24662	use `test`; insert into t1 values( 133 )
-master-bin.000001	24662	Query	1	24753	use `test`; insert into t1 values( 132 )
-master-bin.000001	24753	Query	1	24844	use `test`; insert into t1 values( 131 )
-master-bin.000001	24844	Query	1	24935	use `test`; insert into t1 values( 130 )
-master-bin.000001	24935	Query	1	25026	use `test`; insert into t1 values( 129 )
-master-bin.000001	25026	Query	1	25117	use `test`; insert into t1 values( 128 )
-master-bin.000001	25117	Query	1	25208	use `test`; insert into t1 values( 127 )
-master-bin.000001	25208	Query	1	25299	use `test`; insert into t1 values( 126 )
-master-bin.000001	25299	Query	1	25390	use `test`; insert into t1 values( 125 )
-master-bin.000001	25390	Query	1	25481	use `test`; insert into t1 values( 124 )
-master-bin.000001	25481	Query	1	25572	use `test`; insert into t1 values( 123 )
-master-bin.000001	25572	Query	1	25663	use `test`; insert into t1 values( 122 )
-master-bin.000001	25663	Query	1	25754	use `test`; insert into t1 values( 121 )
-master-bin.000001	25754	Query	1	25845	use `test`; insert into t1 values( 120 )
-master-bin.000001	25845	Query	1	25936	use `test`; insert into t1 values( 119 )
-master-bin.000001	25936	Query	1	26027	use `test`; insert into t1 values( 118 )
-master-bin.000001	26027	Query	1	26118	use `test`; insert into t1 values( 117 )
-master-bin.000001	26118	Query	1	26209	use `test`; insert into t1 values( 116 )
-master-bin.000001	26209	Query	1	26300	use `test`; insert into t1 values( 115 )
-master-bin.000001	26300	Query	1	26391	use `test`; insert into t1 values( 114 )
-master-bin.000001	26391	Query	1	26482	use `test`; insert into t1 values( 113 )
-master-bin.000001	26482	Query	1	26573	use `test`; insert into t1 values( 112 )
-master-bin.000001	26573	Query	1	26664	use `test`; insert into t1 values( 111 )
-master-bin.000001	26664	Query	1	26755	use `test`; insert into t1 values( 110 )
-master-bin.000001	26755	Query	1	26846	use `test`; insert into t1 values( 109 )
-master-bin.000001	26846	Query	1	26937	use `test`; insert into t1 values( 108 )
-master-bin.000001	26937	Query	1	27028	use `test`; insert into t1 values( 107 )
-master-bin.000001	27028	Query	1	27119	use `test`; insert into t1 values( 106 )
-master-bin.000001	27119	Query	1	27210	use `test`; insert into t1 values( 105 )
-master-bin.000001	27210	Query	1	27301	use `test`; insert into t1 values( 104 )
-master-bin.000001	27301	Query	1	27392	use `test`; insert into t1 values( 103 )
-master-bin.000001	27392	Query	1	27483	use `test`; insert into t1 values( 102 )
-master-bin.000001	27483	Query	1	27574	use `test`; insert into t1 values( 101 )
-master-bin.000001	27574	Query	1	27665	use `test`; insert into t1 values( 100 )
-master-bin.000001	27665	Query	1	27755	use `test`; insert into t1 values( 99 )
-master-bin.000001	27755	Query	1	27845	use `test`; insert into t1 values( 98 )
-master-bin.000001	27845	Query	1	27935	use `test`; insert into t1 values( 97 )
-master-bin.000001	27935	Query	1	28025	use `test`; insert into t1 values( 96 )
-master-bin.000001	28025	Query	1	28115	use `test`; insert into t1 values( 95 )
-master-bin.000001	28115	Query	1	28205	use `test`; insert into t1 values( 94 )
-master-bin.000001	28205	Query	1	28295	use `test`; insert into t1 values( 93 )
-master-bin.000001	28295	Query	1	28385	use `test`; insert into t1 values( 92 )
-master-bin.000001	28385	Query	1	28475	use `test`; insert into t1 values( 91 )
-master-bin.000001	28475	Query	1	28565	use `test`; insert into t1 values( 90 )
-master-bin.000001	28565	Query	1	28655	use `test`; insert into t1 values( 89 )
-master-bin.000001	28655	Query	1	28745	use `test`; insert into t1 values( 88 )
-master-bin.000001	28745	Query	1	28835	use `test`; insert into t1 values( 87 )
-master-bin.000001	28835	Query	1	28925	use `test`; insert into t1 values( 86 )
-master-bin.000001	28925	Query	1	29015	use `test`; insert into t1 values( 85 )
-master-bin.000001	29015	Query	1	29105	use `test`; insert into t1 values( 84 )
-master-bin.000001	29105	Query	1	29195	use `test`; insert into t1 values( 83 )
-master-bin.000001	29195	Query	1	29285	use `test`; insert into t1 values( 82 )
-master-bin.000001	29285	Query	1	29375	use `test`; insert into t1 values( 81 )
-master-bin.000001	29375	Query	1	29465	use `test`; insert into t1 values( 80 )
-master-bin.000001	29465	Query	1	29555	use `test`; insert into t1 values( 79 )
-master-bin.000001	29555	Query	1	29645	use `test`; insert into t1 values( 78 )
-master-bin.000001	29645	Query	1	29735	use `test`; insert into t1 values( 77 )
-master-bin.000001	29735	Query	1	29825	use `test`; insert into t1 values( 76 )
-master-bin.000001	29825	Query	1	29915	use `test`; insert into t1 values( 75 )
-master-bin.000001	29915	Query	1	30005	use `test`; insert into t1 values( 74 )
-master-bin.000001	30005	Query	1	30095	use `test`; insert into t1 values( 73 )
-master-bin.000001	30095	Query	1	30185	use `test`; insert into t1 values( 72 )
-master-bin.000001	30185	Query	1	30275	use `test`; insert into t1 values( 71 )
-master-bin.000001	30275	Query	1	30365	use `test`; insert into t1 values( 70 )
-master-bin.000001	30365	Query	1	30455	use `test`; insert into t1 values( 69 )
-master-bin.000001	30455	Query	1	30545	use `test`; insert into t1 values( 68 )
-master-bin.000001	30545	Query	1	30635	use `test`; insert into t1 values( 67 )
-master-bin.000001	30635	Query	1	30725	use `test`; insert into t1 values( 66 )
-master-bin.000001	30725	Query	1	30815	use `test`; insert into t1 values( 65 )
-master-bin.000001	30815	Query	1	30905	use `test`; insert into t1 values( 64 )
-master-bin.000001	30905	Query	1	30995	use `test`; insert into t1 values( 63 )
-master-bin.000001	30995	Query	1	31085	use `test`; insert into t1 values( 62 )
-master-bin.000001	31085	Query	1	31175	use `test`; insert into t1 values( 61 )
-master-bin.000001	31175	Query	1	31265	use `test`; insert into t1 values( 60 )
-master-bin.000001	31265	Query	1	31355	use `test`; insert into t1 values( 59 )
-master-bin.000001	31355	Query	1	31445	use `test`; insert into t1 values( 58 )
-master-bin.000001	31445	Query	1	31535	use `test`; insert into t1 values( 57 )
-master-bin.000001	31535	Query	1	31625	use `test`; insert into t1 values( 56 )
-master-bin.000001	31625	Query	1	31715	use `test`; insert into t1 values( 55 )
-master-bin.000001	31715	Query	1	31805	use `test`; insert into t1 values( 54 )
-master-bin.000001	31805	Query	1	31895	use `test`; insert into t1 values( 53 )
-master-bin.000001	31895	Query	1	31985	use `test`; insert into t1 values( 52 )
-master-bin.000001	31985	Query	1	32075	use `test`; insert into t1 values( 51 )
-master-bin.000001	32075	Query	1	32165	use `test`; insert into t1 values( 50 )
-master-bin.000001	32165	Query	1	32255	use `test`; insert into t1 values( 49 )
-master-bin.000001	32255	Query	1	32345	use `test`; insert into t1 values( 48 )
-master-bin.000001	32345	Query	1	32435	use `test`; insert into t1 values( 47 )
-master-bin.000001	32435	Query	1	32525	use `test`; insert into t1 values( 46 )
-master-bin.000001	32525	Query	1	32615	use `test`; insert into t1 values( 45 )
-master-bin.000001	32615	Query	1	32705	use `test`; insert into t1 values( 44 )
-master-bin.000001	32705	Query	1	32795	use `test`; insert into t1 values( 43 )
-master-bin.000001	32795	Query	1	32885	use `test`; insert into t1 values( 42 )
-master-bin.000001	32885	Query	1	32975	use `test`; insert into t1 values( 41 )
-master-bin.000001	32975	Query	1	33065	use `test`; insert into t1 values( 40 )
-master-bin.000001	33065	Query	1	33155	use `test`; insert into t1 values( 39 )
-master-bin.000001	33155	Query	1	33245	use `test`; insert into t1 values( 38 )
-master-bin.000001	33245	Query	1	33335	use `test`; insert into t1 values( 37 )
-master-bin.000001	33335	Query	1	33425	use `test`; insert into t1 values( 36 )
-master-bin.000001	33425	Query	1	33515	use `test`; insert into t1 values( 35 )
-master-bin.000001	33515	Query	1	33605	use `test`; insert into t1 values( 34 )
-master-bin.000001	33605	Query	1	33695	use `test`; insert into t1 values( 33 )
-master-bin.000001	33695	Query	1	33785	use `test`; insert into t1 values( 32 )
-master-bin.000001	33785	Query	1	33875	use `test`; insert into t1 values( 31 )
-master-bin.000001	33875	Query	1	33965	use `test`; insert into t1 values( 30 )
-master-bin.000001	33965	Query	1	34055	use `test`; insert into t1 values( 29 )
-master-bin.000001	34055	Query	1	34145	use `test`; insert into t1 values( 28 )
-master-bin.000001	34145	Query	1	34235	use `test`; insert into t1 values( 27 )
-master-bin.000001	34235	Query	1	34325	use `test`; insert into t1 values( 26 )
-master-bin.000001	34325	Query	1	34415	use `test`; insert into t1 values( 25 )
-master-bin.000001	34415	Query	1	34505	use `test`; insert into t1 values( 24 )
-master-bin.000001	34505	Query	1	34595	use `test`; insert into t1 values( 23 )
-master-bin.000001	34595	Query	1	34685	use `test`; insert into t1 values( 22 )
-master-bin.000001	34685	Query	1	34775	use `test`; insert into t1 values( 21 )
-master-bin.000001	34775	Query	1	34865	use `test`; insert into t1 values( 20 )
-master-bin.000001	34865	Query	1	34955	use `test`; insert into t1 values( 19 )
-master-bin.000001	34955	Query	1	35045	use `test`; insert into t1 values( 18 )
-master-bin.000001	35045	Query	1	35135	use `test`; insert into t1 values( 17 )
-master-bin.000001	35135	Query	1	35225	use `test`; insert into t1 values( 16 )
-master-bin.000001	35225	Query	1	35315	use `test`; insert into t1 values( 15 )
-master-bin.000001	35315	Query	1	35405	use `test`; insert into t1 values( 14 )
-master-bin.000001	35405	Query	1	35495	use `test`; insert into t1 values( 13 )
-master-bin.000001	35495	Query	1	35585	use `test`; insert into t1 values( 12 )
-master-bin.000001	35585	Query	1	35675	use `test`; insert into t1 values( 11 )
-master-bin.000001	35675	Query	1	35765	use `test`; insert into t1 values( 10 )
-master-bin.000001	35765	Query	1	35854	use `test`; insert into t1 values( 9 )
-master-bin.000001	35854	Query	1	35943	use `test`; insert into t1 values( 8 )
-master-bin.000001	35943	Query	1	36032	use `test`; insert into t1 values( 7 )
-master-bin.000001	36032	Query	1	36121	use `test`; insert into t1 values( 6 )
-master-bin.000001	36121	Query	1	36210	use `test`; insert into t1 values( 5 )
-master-bin.000001	36210	Query	1	36299	use `test`; insert into t1 values( 4 )
-master-bin.000001	36299	Query	1	36388	use `test`; insert into t1 values( 3 )
-master-bin.000001	36388	Query	1	36477	use `test`; insert into t1 values( 2 )
-master-bin.000001	36477	Query	1	36566	use `test`; insert into t1 values( 1 )
-master-bin.000001	36566	Xid	1	36593	COMMIT /* XID */
-master-bin.000001	36593	Rotate	1	36637	master-bin.000002;pos=4
+master-bin.000001	4	Format_desc	1	107	Server version, Binlog ver: 4
+master-bin.000001	107	Query	1	207	use `test`; create table t1 (a int) engine=innodb
+master-bin.000001	207	Query	1	275	use `test`; BEGIN
+master-bin.000001	275	Query	1	366	use `test`; insert into t1 values( 400 )
+master-bin.000001	366	Query	1	457	use `test`; insert into t1 values( 399 )
+master-bin.000001	457	Query	1	548	use `test`; insert into t1 values( 398 )
+master-bin.000001	548	Query	1	639	use `test`; insert into t1 values( 397 )
+master-bin.000001	639	Query	1	730	use `test`; insert into t1 values( 396 )
+master-bin.000001	730	Query	1	821	use `test`; insert into t1 values( 395 )
+master-bin.000001	821	Query	1	912	use `test`; insert into t1 values( 394 )
+master-bin.000001	912	Query	1	1003	use `test`; insert into t1 values( 393 )
+master-bin.000001	1003	Query	1	1094	use `test`; insert into t1 values( 392 )
+master-bin.000001	1094	Query	1	1185	use `test`; insert into t1 values( 391 )
+master-bin.000001	1185	Query	1	1276	use `test`; insert into t1 values( 390 )
+master-bin.000001	1276	Query	1	1367	use `test`; insert into t1 values( 389 )
+master-bin.000001	1367	Query	1	1458	use `test`; insert into t1 values( 388 )
+master-bin.000001	1458	Query	1	1549	use `test`; insert into t1 values( 387 )
+master-bin.000001	1549	Query	1	1640	use `test`; insert into t1 values( 386 )
+master-bin.000001	1640	Query	1	1731	use `test`; insert into t1 values( 385 )
+master-bin.000001	1731	Query	1	1822	use `test`; insert into t1 values( 384 )
+master-bin.000001	1822	Query	1	1913	use `test`; insert into t1 values( 383 )
+master-bin.000001	1913	Query	1	2004	use `test`; insert into t1 values( 382 )
+master-bin.000001	2004	Query	1	2095	use `test`; insert into t1 values( 381 )
+master-bin.000001	2095	Query	1	2186	use `test`; insert into t1 values( 380 )
+master-bin.000001	2186	Query	1	2277	use `test`; insert into t1 values( 379 )
+master-bin.000001	2277	Query	1	2368	use `test`; insert into t1 values( 378 )
+master-bin.000001	2368	Query	1	2459	use `test`; insert into t1 values( 377 )
+master-bin.000001	2459	Query	1	2550	use `test`; insert into t1 values( 376 )
+master-bin.000001	2550	Query	1	2641	use `test`; insert into t1 values( 375 )
+master-bin.000001	2641	Query	1	2732	use `test`; insert into t1 values( 374 )
+master-bin.000001	2732	Query	1	2823	use `test`; insert into t1 values( 373 )
+master-bin.000001	2823	Query	1	2914	use `test`; insert into t1 values( 372 )
+master-bin.000001	2914	Query	1	3005	use `test`; insert into t1 values( 371 )
+master-bin.000001	3005	Query	1	3096	use `test`; insert into t1 values( 370 )
+master-bin.000001	3096	Query	1	3187	use `test`; insert into t1 values( 369 )
+master-bin.000001	3187	Query	1	3278	use `test`; insert into t1 values( 368 )
+master-bin.000001	3278	Query	1	3369	use `test`; insert into t1 values( 367 )
+master-bin.000001	3369	Query	1	3460	use `test`; insert into t1 values( 366 )
+master-bin.000001	3460	Query	1	3551	use `test`; insert into t1 values( 365 )
+master-bin.000001	3551	Query	1	3642	use `test`; insert into t1 values( 364 )
+master-bin.000001	3642	Query	1	3733	use `test`; insert into t1 values( 363 )
+master-bin.000001	3733	Query	1	3824	use `test`; insert into t1 values( 362 )
+master-bin.000001	3824	Query	1	3915	use `test`; insert into t1 values( 361 )
+master-bin.000001	3915	Query	1	4006	use `test`; insert into t1 values( 360 )
+master-bin.000001	4006	Query	1	4097	use `test`; insert into t1 values( 359 )
+master-bin.000001	4097	Query	1	4188	use `test`; insert into t1 values( 358 )
+master-bin.000001	4188	Query	1	4279	use `test`; insert into t1 values( 357 )
+master-bin.000001	4279	Query	1	4370	use `test`; insert into t1 values( 356 )
+master-bin.000001	4370	Query	1	4461	use `test`; insert into t1 values( 355 )
+master-bin.000001	4461	Query	1	4552	use `test`; insert into t1 values( 354 )
+master-bin.000001	4552	Query	1	4643	use `test`; insert into t1 values( 353 )
+master-bin.000001	4643	Query	1	4734	use `test`; insert into t1 values( 352 )
+master-bin.000001	4734	Query	1	4825	use `test`; insert into t1 values( 351 )
+master-bin.000001	4825	Query	1	4916	use `test`; insert into t1 values( 350 )
+master-bin.000001	4916	Query	1	5007	use `test`; insert into t1 values( 349 )
+master-bin.000001	5007	Query	1	5098	use `test`; insert into t1 values( 348 )
+master-bin.000001	5098	Query	1	5189	use `test`; insert into t1 values( 347 )
+master-bin.000001	5189	Query	1	5280	use `test`; insert into t1 values( 346 )
+master-bin.000001	5280	Query	1	5371	use `test`; insert into t1 values( 345 )
+master-bin.000001	5371	Query	1	5462	use `test`; insert into t1 values( 344 )
+master-bin.000001	5462	Query	1	5553	use `test`; insert into t1 values( 343 )
+master-bin.000001	5553	Query	1	5644	use `test`; insert into t1 values( 342 )
+master-bin.000001	5644	Query	1	5735	use `test`; insert into t1 values( 341 )
+master-bin.000001	5735	Query	1	5826	use `test`; insert into t1 values( 340 )
+master-bin.000001	5826	Query	1	5917	use `test`; insert into t1 values( 339 )
+master-bin.000001	5917	Query	1	6008	use `test`; insert into t1 values( 338 )
+master-bin.000001	6008	Query	1	6099	use `test`; insert into t1 values( 337 )
+master-bin.000001	6099	Query	1	6190	use `test`; insert into t1 values( 336 )
+master-bin.000001	6190	Query	1	6281	use `test`; insert into t1 values( 335 )
+master-bin.000001	6281	Query	1	6372	use `test`; insert into t1 values( 334 )
+master-bin.000001	6372	Query	1	6463	use `test`; insert into t1 values( 333 )
+master-bin.000001	6463	Query	1	6554	use `test`; insert into t1 values( 332 )
+master-bin.000001	6554	Query	1	6645	use `test`; insert into t1 values( 331 )
+master-bin.000001	6645	Query	1	6736	use `test`; insert into t1 values( 330 )
+master-bin.000001	6736	Query	1	6827	use `test`; insert into t1 values( 329 )
+master-bin.000001	6827	Query	1	6918	use `test`; insert into t1 values( 328 )
+master-bin.000001	6918	Query	1	7009	use `test`; insert into t1 values( 327 )
+master-bin.000001	7009	Query	1	7100	use `test`; insert into t1 values( 326 )
+master-bin.000001	7100	Query	1	7191	use `test`; insert into t1 values( 325 )
+master-bin.000001	7191	Query	1	7282	use `test`; insert into t1 values( 324 )
+master-bin.000001	7282	Query	1	7373	use `test`; insert into t1 values( 323 )
+master-bin.000001	7373	Query	1	7464	use `test`; insert into t1 values( 322 )
+master-bin.000001	7464	Query	1	7555	use `test`; insert into t1 values( 321 )
+master-bin.000001	7555	Query	1	7646	use `test`; insert into t1 values( 320 )
+master-bin.000001	7646	Query	1	7737	use `test`; insert into t1 values( 319 )
+master-bin.000001	7737	Query	1	7828	use `test`; insert into t1 values( 318 )
+master-bin.000001	7828	Query	1	7919	use `test`; insert into t1 values( 317 )
+master-bin.000001	7919	Query	1	8010	use `test`; insert into t1 values( 316 )
+master-bin.000001	8010	Query	1	8101	use `test`; insert into t1 values( 315 )
+master-bin.000001	8101	Query	1	8192	use `test`; insert into t1 values( 314 )
+master-bin.000001	8192	Query	1	8283	use `test`; insert into t1 values( 313 )
+master-bin.000001	8283	Query	1	8374	use `test`; insert into t1 values( 312 )
+master-bin.000001	8374	Query	1	8465	use `test`; insert into t1 values( 311 )
+master-bin.000001	8465	Query	1	8556	use `test`; insert into t1 values( 310 )
+master-bin.000001	8556	Query	1	8647	use `test`; insert into t1 values( 309 )
+master-bin.000001	8647	Query	1	8738	use `test`; insert into t1 values( 308 )
+master-bin.000001	8738	Query	1	8829	use `test`; insert into t1 values( 307 )
+master-bin.000001	8829	Query	1	8920	use `test`; insert into t1 values( 306 )
+master-bin.000001	8920	Query	1	9011	use `test`; insert into t1 values( 305 )
+master-bin.000001	9011	Query	1	9102	use `test`; insert into t1 values( 304 )
+master-bin.000001	9102	Query	1	9193	use `test`; insert into t1 values( 303 )
+master-bin.000001	9193	Query	1	9284	use `test`; insert into t1 values( 302 )
+master-bin.000001	9284	Query	1	9375	use `test`; insert into t1 values( 301 )
+master-bin.000001	9375	Query	1	9466	use `test`; insert into t1 values( 300 )
+master-bin.000001	9466	Query	1	9557	use `test`; insert into t1 values( 299 )
+master-bin.000001	9557	Query	1	9648	use `test`; insert into t1 values( 298 )
+master-bin.000001	9648	Query	1	9739	use `test`; insert into t1 values( 297 )
+master-bin.000001	9739	Query	1	9830	use `test`; insert into t1 values( 296 )
+master-bin.000001	9830	Query	1	9921	use `test`; insert into t1 values( 295 )
+master-bin.000001	9921	Query	1	10012	use `test`; insert into t1 values( 294 )
+master-bin.000001	10012	Query	1	10103	use `test`; insert into t1 values( 293 )
+master-bin.000001	10103	Query	1	10194	use `test`; insert into t1 values( 292 )
+master-bin.000001	10194	Query	1	10285	use `test`; insert into t1 values( 291 )
+master-bin.000001	10285	Query	1	10376	use `test`; insert into t1 values( 290 )
+master-bin.000001	10376	Query	1	10467	use `test`; insert into t1 values( 289 )
+master-bin.000001	10467	Query	1	10558	use `test`; insert into t1 values( 288 )
+master-bin.000001	10558	Query	1	10649	use `test`; insert into t1 values( 287 )
+master-bin.000001	10649	Query	1	10740	use `test`; insert into t1 values( 286 )
+master-bin.000001	10740	Query	1	10831	use `test`; insert into t1 values( 285 )
+master-bin.000001	10831	Query	1	10922	use `test`; insert into t1 values( 284 )
+master-bin.000001	10922	Query	1	11013	use `test`; insert into t1 values( 283 )
+master-bin.000001	11013	Query	1	11104	use `test`; insert into t1 values( 282 )
+master-bin.000001	11104	Query	1	11195	use `test`; insert into t1 values( 281 )
+master-bin.000001	11195	Query	1	11286	use `test`; insert into t1 values( 280 )
+master-bin.000001	11286	Query	1	11377	use `test`; insert into t1 values( 279 )
+master-bin.000001	11377	Query	1	11468	use `test`; insert into t1 values( 278 )
+master-bin.000001	11468	Query	1	11559	use `test`; insert into t1 values( 277 )
+master-bin.000001	11559	Query	1	11650	use `test`; insert into t1 values( 276 )
+master-bin.000001	11650	Query	1	11741	use `test`; insert into t1 values( 275 )
+master-bin.000001	11741	Query	1	11832	use `test`; insert into t1 values( 274 )
+master-bin.000001	11832	Query	1	11923	use `test`; insert into t1 values( 273 )
+master-bin.000001	11923	Query	1	12014	use `test`; insert into t1 values( 272 )
+master-bin.000001	12014	Query	1	12105	use `test`; insert into t1 values( 271 )
+master-bin.000001	12105	Query	1	12196	use `test`; insert into t1 values( 270 )
+master-bin.000001	12196	Query	1	12287	use `test`; insert into t1 values( 269 )
+master-bin.000001	12287	Query	1	12378	use `test`; insert into t1 values( 268 )
+master-bin.000001	12378	Query	1	12469	use `test`; insert into t1 values( 267 )
+master-bin.000001	12469	Query	1	12560	use `test`; insert into t1 values( 266 )
+master-bin.000001	12560	Query	1	12651	use `test`; insert into t1 values( 265 )
+master-bin.000001	12651	Query	1	12742	use `test`; insert into t1 values( 264 )
+master-bin.000001	12742	Query	1	12833	use `test`; insert into t1 values( 263 )
+master-bin.000001	12833	Query	1	12924	use `test`; insert into t1 values( 262 )
+master-bin.000001	12924	Query	1	13015	use `test`; insert into t1 values( 261 )
+master-bin.000001	13015	Query	1	13106	use `test`; insert into t1 values( 260 )
+master-bin.000001	13106	Query	1	13197	use `test`; insert into t1 values( 259 )
+master-bin.000001	13197	Query	1	13288	use `test`; insert into t1 values( 258 )
+master-bin.000001	13288	Query	1	13379	use `test`; insert into t1 values( 257 )
+master-bin.000001	13379	Query	1	13470	use `test`; insert into t1 values( 256 )
+master-bin.000001	13470	Query	1	13561	use `test`; insert into t1 values( 255 )
+master-bin.000001	13561	Query	1	13652	use `test`; insert into t1 values( 254 )
+master-bin.000001	13652	Query	1	13743	use `test`; insert into t1 values( 253 )
+master-bin.000001	13743	Query	1	13834	use `test`; insert into t1 values( 252 )
+master-bin.000001	13834	Query	1	13925	use `test`; insert into t1 values( 251 )
+master-bin.000001	13925	Query	1	14016	use `test`; insert into t1 values( 250 )
+master-bin.000001	14016	Query	1	14107	use `test`; insert into t1 values( 249 )
+master-bin.000001	14107	Query	1	14198	use `test`; insert into t1 values( 248 )
+master-bin.000001	14198	Query	1	14289	use `test`; insert into t1 values( 247 )
+master-bin.000001	14289	Query	1	14380	use `test`; insert into t1 values( 246 )
+master-bin.000001	14380	Query	1	14471	use `test`; insert into t1 values( 245 )
+master-bin.000001	14471	Query	1	14562	use `test`; insert into t1 values( 244 )
+master-bin.000001	14562	Query	1	14653	use `test`; insert into t1 values( 243 )
+master-bin.000001	14653	Query	1	14744	use `test`; insert into t1 values( 242 )
+master-bin.000001	14744	Query	1	14835	use `test`; insert into t1 values( 241 )
+master-bin.000001	14835	Query	1	14926	use `test`; insert into t1 values( 240 )
+master-bin.000001	14926	Query	1	15017	use `test`; insert into t1 values( 239 )
+master-bin.000001	15017	Query	1	15108	use `test`; insert into t1 values( 238 )
+master-bin.000001	15108	Query	1	15199	use `test`; insert into t1 values( 237 )
+master-bin.000001	15199	Query	1	15290	use `test`; insert into t1 values( 236 )
+master-bin.000001	15290	Query	1	15381	use `test`; insert into t1 values( 235 )
+master-bin.000001	15381	Query	1	15472	use `test`; insert into t1 values( 234 )
+master-bin.000001	15472	Query	1	15563	use `test`; insert into t1 values( 233 )
+master-bin.000001	15563	Query	1	15654	use `test`; insert into t1 values( 232 )
+master-bin.000001	15654	Query	1	15745	use `test`; insert into t1 values( 231 )
+master-bin.000001	15745	Query	1	15836	use `test`; insert into t1 values( 230 )
+master-bin.000001	15836	Query	1	15927	use `test`; insert into t1 values( 229 )
+master-bin.000001	15927	Query	1	16018	use `test`; insert into t1 values( 228 )
+master-bin.000001	16018	Query	1	16109	use `test`; insert into t1 values( 227 )
+master-bin.000001	16109	Query	1	16200	use `test`; insert into t1 values( 226 )
+master-bin.000001	16200	Query	1	16291	use `test`; insert into t1 values( 225 )
+master-bin.000001	16291	Query	1	16382	use `test`; insert into t1 values( 224 )
+master-bin.000001	16382	Query	1	16473	use `test`; insert into t1 values( 223 )
+master-bin.000001	16473	Query	1	16564	use `test`; insert into t1 values( 222 )
+master-bin.000001	16564	Query	1	16655	use `test`; insert into t1 values( 221 )
+master-bin.000001	16655	Query	1	16746	use `test`; insert into t1 values( 220 )
+master-bin.000001	16746	Query	1	16837	use `test`; insert into t1 values( 219 )
+master-bin.000001	16837	Query	1	16928	use `test`; insert into t1 values( 218 )
+master-bin.000001	16928	Query	1	17019	use `test`; insert into t1 values( 217 )
+master-bin.000001	17019	Query	1	17110	use `test`; insert into t1 values( 216 )
+master-bin.000001	17110	Query	1	17201	use `test`; insert into t1 values( 215 )
+master-bin.000001	17201	Query	1	17292	use `test`; insert into t1 values( 214 )
+master-bin.000001	17292	Query	1	17383	use `test`; insert into t1 values( 213 )
+master-bin.000001	17383	Query	1	17474	use `test`; insert into t1 values( 212 )
+master-bin.000001	17474	Query	1	17565	use `test`; insert into t1 values( 211 )
+master-bin.000001	17565	Query	1	17656	use `test`; insert into t1 values( 210 )
+master-bin.000001	17656	Query	1	17747	use `test`; insert into t1 values( 209 )
+master-bin.000001	17747	Query	1	17838	use `test`; insert into t1 values( 208 )
+master-bin.000001	17838	Query	1	17929	use `test`; insert into t1 values( 207 )
+master-bin.000001	17929	Query	1	18020	use `test`; insert into t1 values( 206 )
+master-bin.000001	18020	Query	1	18111	use `test`; insert into t1 values( 205 )
+master-bin.000001	18111	Query	1	18202	use `test`; insert into t1 values( 204 )
+master-bin.000001	18202	Query	1	18293	use `test`; insert into t1 values( 203 )
+master-bin.000001	18293	Query	1	18384	use `test`; insert into t1 values( 202 )
+master-bin.000001	18384	Query	1	18475	use `test`; insert into t1 values( 201 )
+master-bin.000001	18475	Query	1	18566	use `test`; insert into t1 values( 200 )
+master-bin.000001	18566	Query	1	18657	use `test`; insert into t1 values( 199 )
+master-bin.000001	18657	Query	1	18748	use `test`; insert into t1 values( 198 )
+master-bin.000001	18748	Query	1	18839	use `test`; insert into t1 values( 197 )
+master-bin.000001	18839	Query	1	18930	use `test`; insert into t1 values( 196 )
+master-bin.000001	18930	Query	1	19021	use `test`; insert into t1 values( 195 )
+master-bin.000001	19021	Query	1	19112	use `test`; insert into t1 values( 194 )
+master-bin.000001	19112	Query	1	19203	use `test`; insert into t1 values( 193 )
+master-bin.000001	19203	Query	1	19294	use `test`; insert into t1 values( 192 )
+master-bin.000001	19294	Query	1	19385	use `test`; insert into t1 values( 191 )
+master-bin.000001	19385	Query	1	19476	use `test`; insert into t1 values( 190 )
+master-bin.000001	19476	Query	1	19567	use `test`; insert into t1 values( 189 )
+master-bin.000001	19567	Query	1	19658	use `test`; insert into t1 values( 188 )
+master-bin.000001	19658	Query	1	19749	use `test`; insert into t1 values( 187 )
+master-bin.000001	19749	Query	1	19840	use `test`; insert into t1 values( 186 )
+master-bin.000001	19840	Query	1	19931	use `test`; insert into t1 values( 185 )
+master-bin.000001	19931	Query	1	20022	use `test`; insert into t1 values( 184 )
+master-bin.000001	20022	Query	1	20113	use `test`; insert into t1 values( 183 )
+master-bin.000001	20113	Query	1	20204	use `test`; insert into t1 values( 182 )
+master-bin.000001	20204	Query	1	20295	use `test`; insert into t1 values( 181 )
+master-bin.000001	20295	Query	1	20386	use `test`; insert into t1 values( 180 )
+master-bin.000001	20386	Query	1	20477	use `test`; insert into t1 values( 179 )
+master-bin.000001	20477	Query	1	20568	use `test`; insert into t1 values( 178 )
+master-bin.000001	20568	Query	1	20659	use `test`; insert into t1 values( 177 )
+master-bin.000001	20659	Query	1	20750	use `test`; insert into t1 values( 176 )
+master-bin.000001	20750	Query	1	20841	use `test`; insert into t1 values( 175 )
+master-bin.000001	20841	Query	1	20932	use `test`; insert into t1 values( 174 )
+master-bin.000001	20932	Query	1	21023	use `test`; insert into t1 values( 173 )
+master-bin.000001	21023	Query	1	21114	use `test`; insert into t1 values( 172 )
+master-bin.000001	21114	Query	1	21205	use `test`; insert into t1 values( 171 )
+master-bin.000001	21205	Query	1	21296	use `test`; insert into t1 values( 170 )
+master-bin.000001	21296	Query	1	21387	use `test`; insert into t1 values( 169 )
+master-bin.000001	21387	Query	1	21478	use `test`; insert into t1 values( 168 )
+master-bin.000001	21478	Query	1	21569	use `test`; insert into t1 values( 167 )
+master-bin.000001	21569	Query	1	21660	use `test`; insert into t1 values( 166 )
+master-bin.000001	21660	Query	1	21751	use `test`; insert into t1 values( 165 )
+master-bin.000001	21751	Query	1	21842	use `test`; insert into t1 values( 164 )
+master-bin.000001	21842	Query	1	21933	use `test`; insert into t1 values( 163 )
+master-bin.000001	21933	Query	1	22024	use `test`; insert into t1 values( 162 )
+master-bin.000001	22024	Query	1	22115	use `test`; insert into t1 values( 161 )
+master-bin.000001	22115	Query	1	22206	use `test`; insert into t1 values( 160 )
+master-bin.000001	22206	Query	1	22297	use `test`; insert into t1 values( 159 )
+master-bin.000001	22297	Query	1	22388	use `test`; insert into t1 values( 158 )
+master-bin.000001	22388	Query	1	22479	use `test`; insert into t1 values( 157 )
+master-bin.000001	22479	Query	1	22570	use `test`; insert into t1 values( 156 )
+master-bin.000001	22570	Query	1	22661	use `test`; insert into t1 values( 155 )
+master-bin.000001	22661	Query	1	22752	use `test`; insert into t1 values( 154 )
+master-bin.000001	22752	Query	1	22843	use `test`; insert into t1 values( 153 )
+master-bin.000001	22843	Query	1	22934	use `test`; insert into t1 values( 152 )
+master-bin.000001	22934	Query	1	23025	use `test`; insert into t1 values( 151 )
+master-bin.000001	23025	Query	1	23116	use `test`; insert into t1 values( 150 )
+master-bin.000001	23116	Query	1	23207	use `test`; insert into t1 values( 149 )
+master-bin.000001	23207	Query	1	23298	use `test`; insert into t1 values( 148 )
+master-bin.000001	23298	Query	1	23389	use `test`; insert into t1 values( 147 )
+master-bin.000001	23389	Query	1	23480	use `test`; insert into t1 values( 146 )
+master-bin.000001	23480	Query	1	23571	use `test`; insert into t1 values( 145 )
+master-bin.000001	23571	Query	1	23662	use `test`; insert into t1 values( 144 )
+master-bin.000001	23662	Query	1	23753	use `test`; insert into t1 values( 143 )
+master-bin.000001	23753	Query	1	23844	use `test`; insert into t1 values( 142 )
+master-bin.000001	23844	Query	1	23935	use `test`; insert into t1 values( 141 )
+master-bin.000001	23935	Query	1	24026	use `test`; insert into t1 values( 140 )
+master-bin.000001	24026	Query	1	24117	use `test`; insert into t1 values( 139 )
+master-bin.000001	24117	Query	1	24208	use `test`; insert into t1 values( 138 )
+master-bin.000001	24208	Query	1	24299	use `test`; insert into t1 values( 137 )
+master-bin.000001	24299	Query	1	24390	use `test`; insert into t1 values( 136 )
+master-bin.000001	24390	Query	1	24481	use `test`; insert into t1 values( 135 )
+master-bin.000001	24481	Query	1	24572	use `test`; insert into t1 values( 134 )
+master-bin.000001	24572	Query	1	24663	use `test`; insert into t1 values( 133 )
+master-bin.000001	24663	Query	1	24754	use `test`; insert into t1 values( 132 )
+master-bin.000001	24754	Query	1	24845	use `test`; insert into t1 values( 131 )
+master-bin.000001	24845	Query	1	24936	use `test`; insert into t1 values( 130 )
+master-bin.000001	24936	Query	1	25027	use `test`; insert into t1 values( 129 )
+master-bin.000001	25027	Query	1	25118	use `test`; insert into t1 values( 128 )
+master-bin.000001	25118	Query	1	25209	use `test`; insert into t1 values( 127 )
+master-bin.000001	25209	Query	1	25300	use `test`; insert into t1 values( 126 )
+master-bin.000001	25300	Query	1	25391	use `test`; insert into t1 values( 125 )
+master-bin.000001	25391	Query	1	25482	use `test`; insert into t1 values( 124 )
+master-bin.000001	25482	Query	1	25573	use `test`; insert into t1 values( 123 )
+master-bin.000001	25573	Query	1	25664	use `test`; insert into t1 values( 122 )
+master-bin.000001	25664	Query	1	25755	use `test`; insert into t1 values( 121 )
+master-bin.000001	25755	Query	1	25846	use `test`; insert into t1 values( 120 )
+master-bin.000001	25846	Query	1	25937	use `test`; insert into t1 values( 119 )
+master-bin.000001	25937	Query	1	26028	use `test`; insert into t1 values( 118 )
+master-bin.000001	26028	Query	1	26119	use `test`; insert into t1 values( 117 )
+master-bin.000001	26119	Query	1	26210	use `test`; insert into t1 values( 116 )
+master-bin.000001	26210	Query	1	26301	use `test`; insert into t1 values( 115 )
+master-bin.000001	26301	Query	1	26392	use `test`; insert into t1 values( 114 )
+master-bin.000001	26392	Query	1	26483	use `test`; insert into t1 values( 113 )
+master-bin.000001	26483	Query	1	26574	use `test`; insert into t1 values( 112 )
+master-bin.000001	26574	Query	1	26665	use `test`; insert into t1 values( 111 )
+master-bin.000001	26665	Query	1	26756	use `test`; insert into t1 values( 110 )
+master-bin.000001	26756	Query	1	26847	use `test`; insert into t1 values( 109 )
+master-bin.000001	26847	Query	1	26938	use `test`; insert into t1 values( 108 )
+master-bin.000001	26938	Query	1	27029	use `test`; insert into t1 values( 107 )
+master-bin.000001	27029	Query	1	27120	use `test`; insert into t1 values( 106 )
+master-bin.000001	27120	Query	1	27211	use `test`; insert into t1 values( 105 )
+master-bin.000001	27211	Query	1	27302	use `test`; insert into t1 values( 104 )
+master-bin.000001	27302	Query	1	27393	use `test`; insert into t1 values( 103 )
+master-bin.000001	27393	Query	1	27484	use `test`; insert into t1 values( 102 )
+master-bin.000001	27484	Query	1	27575	use `test`; insert into t1 values( 101 )
+master-bin.000001	27575	Query	1	27666	use `test`; insert into t1 values( 100 )
+master-bin.000001	27666	Query	1	27756	use `test`; insert into t1 values( 99 )
+master-bin.000001	27756	Query	1	27846	use `test`; insert into t1 values( 98 )
+master-bin.000001	27846	Query	1	27936	use `test`; insert into t1 values( 97 )
+master-bin.000001	27936	Query	1	28026	use `test`; insert into t1 values( 96 )
+master-bin.000001	28026	Query	1	28116	use `test`; insert into t1 values( 95 )
+master-bin.000001	28116	Query	1	28206	use `test`; insert into t1 values( 94 )
+master-bin.000001	28206	Query	1	28296	use `test`; insert into t1 values( 93 )
+master-bin.000001	28296	Query	1	28386	use `test`; insert into t1 values( 92 )
+master-bin.000001	28386	Query	1	28476	use `test`; insert into t1 values( 91 )
+master-bin.000001	28476	Query	1	28566	use `test`; insert into t1 values( 90 )
+master-bin.000001	28566	Query	1	28656	use `test`; insert into t1 values( 89 )
+master-bin.000001	28656	Query	1	28746	use `test`; insert into t1 values( 88 )
+master-bin.000001	28746	Query	1	28836	use `test`; insert into t1 values( 87 )
+master-bin.000001	28836	Query	1	28926	use `test`; insert into t1 values( 86 )
+master-bin.000001	28926	Query	1	29016	use `test`; insert into t1 values( 85 )
+master-bin.000001	29016	Query	1	29106	use `test`; insert into t1 values( 84 )
+master-bin.000001	29106	Query	1	29196	use `test`; insert into t1 values( 83 )
+master-bin.000001	29196	Query	1	29286	use `test`; insert into t1 values( 82 )
+master-bin.000001	29286	Query	1	29376	use `test`; insert into t1 values( 81 )
+master-bin.000001	29376	Query	1	29466	use `test`; insert into t1 values( 80 )
+master-bin.000001	29466	Query	1	29556	use `test`; insert into t1 values( 79 )
+master-bin.000001	29556	Query	1	29646	use `test`; insert into t1 values( 78 )
+master-bin.000001	29646	Query	1	29736	use `test`; insert into t1 values( 77 )
+master-bin.000001	29736	Query	1	29826	use `test`; insert into t1 values( 76 )
+master-bin.000001	29826	Query	1	29916	use `test`; insert into t1 values( 75 )
+master-bin.000001	29916	Query	1	30006	use `test`; insert into t1 values( 74 )
+master-bin.000001	30006	Query	1	30096	use `test`; insert into t1 values( 73 )
+master-bin.000001	30096	Query	1	30186	use `test`; insert into t1 values( 72 )
+master-bin.000001	30186	Query	1	30276	use `test`; insert into t1 values( 71 )
+master-bin.000001	30276	Query	1	30366	use `test`; insert into t1 values( 70 )
+master-bin.000001	30366	Query	1	30456	use `test`; insert into t1 values( 69 )
+master-bin.000001	30456	Query	1	30546	use `test`; insert into t1 values( 68 )
+master-bin.000001	30546	Query	1	30636	use `test`; insert into t1 values( 67 )
+master-bin.000001	30636	Query	1	30726	use `test`; insert into t1 values( 66 )
+master-bin.000001	30726	Query	1	30816	use `test`; insert into t1 values( 65 )
+master-bin.000001	30816	Query	1	30906	use `test`; insert into t1 values( 64 )
+master-bin.000001	30906	Query	1	30996	use `test`; insert into t1 values( 63 )
+master-bin.000001	30996	Query	1	31086	use `test`; insert into t1 values( 62 )
+master-bin.000001	31086	Query	1	31176	use `test`; insert into t1 values( 61 )
+master-bin.000001	31176	Query	1	31266	use `test`; insert into t1 values( 60 )
+master-bin.000001	31266	Query	1	31356	use `test`; insert into t1 values( 59 )
+master-bin.000001	31356	Query	1	31446	use `test`; insert into t1 values( 58 )
+master-bin.000001	31446	Query	1	31536	use `test`; insert into t1 values( 57 )
+master-bin.000001	31536	Query	1	31626	use `test`; insert into t1 values( 56 )
+master-bin.000001	31626	Query	1	31716	use `test`; insert into t1 values( 55 )
+master-bin.000001	31716	Query	1	31806	use `test`; insert into t1 values( 54 )
+master-bin.000001	31806	Query	1	31896	use `test`; insert into t1 values( 53 )
+master-bin.000001	31896	Query	1	31986	use `test`; insert into t1 values( 52 )
+master-bin.000001	31986	Query	1	32076	use `test`; insert into t1 values( 51 )
+master-bin.000001	32076	Query	1	32166	use `test`; insert into t1 values( 50 )
+master-bin.000001	32166	Query	1	32256	use `test`; insert into t1 values( 49 )
+master-bin.000001	32256	Query	1	32346	use `test`; insert into t1 values( 48 )
+master-bin.000001	32346	Query	1	32436	use `test`; insert into t1 values( 47 )
+master-bin.000001	32436	Query	1	32526	use `test`; insert into t1 values( 46 )
+master-bin.000001	32526	Query	1	32616	use `test`; insert into t1 values( 45 )
+master-bin.000001	32616	Query	1	32706	use `test`; insert into t1 values( 44 )
+master-bin.000001	32706	Query	1	32796	use `test`; insert into t1 values( 43 )
+master-bin.000001	32796	Query	1	32886	use `test`; insert into t1 values( 42 )
+master-bin.000001	32886	Query	1	32976	use `test`; insert into t1 values( 41 )
+master-bin.000001	32976	Query	1	33066	use `test`; insert into t1 values( 40 )
+master-bin.000001	33066	Query	1	33156	use `test`; insert into t1 values( 39 )
+master-bin.000001	33156	Query	1	33246	use `test`; insert into t1 values( 38 )
+master-bin.000001	33246	Query	1	33336	use `test`; insert into t1 values( 37 )
+master-bin.000001	33336	Query	1	33426	use `test`; insert into t1 values( 36 )
+master-bin.000001	33426	Query	1	33516	use `test`; insert into t1 values( 35 )
+master-bin.000001	33516	Query	1	33606	use `test`; insert into t1 values( 34 )
+master-bin.000001	33606	Query	1	33696	use `test`; insert into t1 values( 33 )
+master-bin.000001	33696	Query	1	33786	use `test`; insert into t1 values( 32 )
+master-bin.000001	33786	Query	1	33876	use `test`; insert into t1 values( 31 )
+master-bin.000001	33876	Query	1	33966	use `test`; insert into t1 values( 30 )
+master-bin.000001	33966	Query	1	34056	use `test`; insert into t1 values( 29 )
+master-bin.000001	34056	Query	1	34146	use `test`; insert into t1 values( 28 )
+master-bin.000001	34146	Query	1	34236	use `test`; insert into t1 values( 27 )
+master-bin.000001	34236	Query	1	34326	use `test`; insert into t1 values( 26 )
+master-bin.000001	34326	Query	1	34416	use `test`; insert into t1 values( 25 )
+master-bin.000001	34416	Query	1	34506	use `test`; insert into t1 values( 24 )
+master-bin.000001	34506	Query	1	34596	use `test`; insert into t1 values( 23 )
+master-bin.000001	34596	Query	1	34686	use `test`; insert into t1 values( 22 )
+master-bin.000001	34686	Query	1	34776	use `test`; insert into t1 values( 21 )
+master-bin.000001	34776	Query	1	34866	use `test`; insert into t1 values( 20 )
+master-bin.000001	34866	Query	1	34956	use `test`; insert into t1 values( 19 )
+master-bin.000001	34956	Query	1	35046	use `test`; insert into t1 values( 18 )
+master-bin.000001	35046	Query	1	35136	use `test`; insert into t1 values( 17 )
+master-bin.000001	35136	Query	1	35226	use `test`; insert into t1 values( 16 )
+master-bin.000001	35226	Query	1	35316	use `test`; insert into t1 values( 15 )
+master-bin.000001	35316	Query	1	35406	use `test`; insert into t1 values( 14 )
+master-bin.000001	35406	Query	1	35496	use `test`; insert into t1 values( 13 )
+master-bin.000001	35496	Query	1	35586	use `test`; insert into t1 values( 12 )
+master-bin.000001	35586	Query	1	35676	use `test`; insert into t1 values( 11 )
+master-bin.000001	35676	Query	1	35766	use `test`; insert into t1 values( 10 )
+master-bin.000001	35766	Query	1	35855	use `test`; insert into t1 values( 9 )
+master-bin.000001	35855	Query	1	35944	use `test`; insert into t1 values( 8 )
+master-bin.000001	35944	Query	1	36033	use `test`; insert into t1 values( 7 )
+master-bin.000001	36033	Query	1	36122	use `test`; insert into t1 values( 6 )
+master-bin.000001	36122	Query	1	36211	use `test`; insert into t1 values( 5 )
+master-bin.000001	36211	Query	1	36300	use `test`; insert into t1 values( 4 )
+master-bin.000001	36300	Query	1	36389	use `test`; insert into t1 values( 3 )
+master-bin.000001	36389	Query	1	36478	use `test`; insert into t1 values( 2 )
+master-bin.000001	36478	Query	1	36567	use `test`; insert into t1 values( 1 )
+master-bin.000001	36567	Xid	1	36594	COMMIT /* XID */
+master-bin.000001	36594	Rotate	1	36638	master-bin.000002;pos=4
 drop table t1;
 set global binlog_cache_size=@bcs;
 set session autocommit = @ac;
@@ -661,12 +661,12 @@ drop table if exists t3;
 create table t3 (a int(11) NOT NULL AUTO_INCREMENT, b text, PRIMARY KEY (a) ) engine=innodb;
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	346		
+master-bin.000001	347		
 insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
 aaaaaaaaaaaaaaaaaaaaaaa');
 insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
 aaaaaaaaaaaaaaaaaaaaaaa');
 insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
 aaaaaaaaaaaaaaaaaaaaaaa');
 insert into t3(b) values ('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa!
 aaaaaaaaaaaaaaaaaaaaaaa');
 show master status /* must show new binlog index after rotating */;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000002	106		
+master-bin.000002	107		
 drop table t3;
diff -Nrup a/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result b/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
--- a/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result	2007-07-31 17:03:58 +02:00
+++ b/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result	2007-10-13 22:40:57 +02:00
@@ -385,7 +385,7 @@ create table ti (a int) engine=innodb;
 reset master;
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	106		
+master-bin.000001	107		
 begin;
 insert into ti values (1);
 insert into ti values (2) ;
@@ -398,14 +398,14 @@ count(*)
 2
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	515		
-show binlog events from 106;
+master-bin.000001	516		
+show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	1	#	use `test`; BEGIN
-master-bin.000001	#	Query	1	#	use `test`; insert into ti values (1)
-master-bin.000001	#	Query	1	#	use `test`; insert into ti values (2)
-master-bin.000001	#	Query	1	#	use `test`; insert into tt select * from ti
-master-bin.000001	#	Query	1	#	use `test`; ROLLBACK
+master-bin.000001	#	Query	#	#	use `test`; BEGIN
+master-bin.000001	#	Query	#	#	use `test`; insert into ti values (1)
+master-bin.000001	#	Query	#	#	use `test`; insert into ti values (2)
+master-bin.000001	#	Query	#	#	use `test`; insert into tt select * from ti
+master-bin.000001	#	Query	#	#	use `test`; ROLLBACK
 select count(*) from ti /* zero */;
 count(*)
 0
@@ -419,7 +419,7 @@ delete from tt where a=1;
 reset master;
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	106		
+master-bin.000001	107		
 begin;
 insert into ti values (1);
 insert into ti values (2) /* to make the dup error in the following */;
@@ -430,14 +430,14 @@ Warnings:
 Warning	1196	Some non-transactional changed tables couldn't be rolled back
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	589		
-show binlog events from 106;
+master-bin.000001	590		
+show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	1	#	use `test`; BEGIN
-master-bin.000001	#	Query	1	#	use `test`; insert into ti values (1)
-master-bin.000001	#	Query	1	#	use `test`; insert into ti values (2) /* to make the dup error in the following */
-master-bin.000001	#	Query	1	#	use `test`; insert into tt select * from ti /* one affected and error */
-master-bin.000001	#	Query	1	#	use `test`; ROLLBACK
+master-bin.000001	#	Query	#	#	use `test`; BEGIN
+master-bin.000001	#	Query	#	#	use `test`; insert into ti values (1)
+master-bin.000001	#	Query	#	#	use `test`; insert into ti values (2) /* to make the dup error in the following */
+master-bin.000001	#	Query	#	#	use `test`; insert into tt select * from ti /* one affected and error */
+master-bin.000001	#	Query	#	#	use `test`; ROLLBACK
 select count(*) from ti /* zero */;
 count(*)
 0
diff -Nrup a/mysql-test/suite/binlog/t/binlog_killed.test b/mysql-test/suite/binlog/t/binlog_killed.test
--- a/mysql-test/suite/binlog/t/binlog_killed.test	2007-06-27 14:27:32 +02:00
+++ b/mysql-test/suite/binlog/t/binlog_killed.test	2007-10-13 22:40:58 +02:00
@@ -39,7 +39,7 @@ connection con2;
 reap;
 let $rows= `select count(*) from t2  /* must be 2 or 0 */`;
 
---exec $MYSQL_BINLOG --start-position=134 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog
+--exec $MYSQL_BINLOG --start-position=135 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 eval select
 (@a:=load_file("$MYSQLTEST_VARDIR/tmp/kill_query_calling_sp.binlog"))
diff -Nrup a/mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test b/mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test
--- a/mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test	2007-07-30 00:10:14 +02:00
+++ b/mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test	2007-10-13 22:40:58 +02:00
@@ -20,7 +20,7 @@
 # ER_SERVER_SHUTDOWN (i.e. disconnection just rolls back transaction
 # and does not make slave to stop)
 flush logs;
---exec $MYSQL_BINLOG --start-position=524 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output
+--exec $MYSQL_BINLOG --start-position=525 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 eval select
 (@a:=load_file("$MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output"))
diff -Nrup a/mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test b/mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test
--- a/mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test	2007-07-31 17:03:58 +02:00
+++ b/mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test	2007-10-13 22:40:58 +02:00
@@ -12,7 +12,7 @@
 # ER_SERVER_SHUTDOWN (i.e. disconnection just rolls back transaction
 # and does not make slave to stop)
 flush logs;
---exec $MYSQL_BINLOG --start-position=555 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output
+--exec $MYSQL_BINLOG --start-position=556 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 eval select
 (@a:=load_file("$MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output"))
@@ -53,8 +53,7 @@ rollback;
 
 select count(*) from tt /* 2 */;
 show master status;
---replace_column 2 # 5 #
-show binlog events from 106;
+source include/show_binlog_events.inc;
 select count(*) from ti /* zero */;
 insert into ti select * from tt;
 select * from ti /* that is what slave would miss - a bug */;
@@ -78,8 +77,7 @@ rollback;
 # check
 
 show master status;
---replace_column 2 # 5 #
-show binlog events from 106;
+source include/show_binlog_events.inc;
 select count(*) from ti /* zero */;
 insert into ti select * from tt;
 select * from tt /* that is what otherwise slave missed - the bug */;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_000015.result b/mysql-test/suite/rpl/r/rpl_000015.result
--- a/mysql-test/suite/rpl/r/rpl_000015.result	2007-06-27 14:28:28 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_000015.result	2007-10-13 22:40:58 +02:00
@@ -1,7 +1,7 @@
 reset master;
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	106		
+master-bin.000001	107		
 reset slave;
 SHOW SLAVE STATUS;
 change master to master_host='127.0.0.1';
@@ -93,7 +93,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	7
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	106
+Read_Master_Log_Pos	107
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -108,7 +108,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	106
+Exec_Master_Log_Pos	107
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
diff -Nrup a/mysql-test/suite/rpl/r/rpl_change_master.result b/mysql-test/suite/rpl/r/rpl_change_master.result
--- a/mysql-test/suite/rpl/r/rpl_change_master.result	2007-06-27 14:28:28 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_change_master.result	2007-10-13 22:40:58 +02:00
@@ -33,7 +33,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	191
+Exec_Master_Log_Pos	192
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
@@ -73,7 +73,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	191
+Exec_Master_Log_Pos	192
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
diff -Nrup a/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result b/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result
--- a/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result	2007-06-27 14:28:28 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result	2007-10-13 22:40:58 +02:00
@@ -85,7 +85,7 @@ Last_SQL_Errno	0
 Last_SQL_Error	
 stop slave;
 delete from t3;
-change master to master_log_pos=548;
+change master to master_log_pos=549;
 begin;
 select * from t2 for update;
 a
@@ -146,7 +146,7 @@ set @my_max_relay_log_size= @@global.max
 set global max_relay_log_size=0;
 stop slave;
 delete from t3;
-change master to master_log_pos=548;
+change master to master_log_pos=549;
 begin;
 select * from t2 for update;
 a
diff -Nrup a/mysql-test/suite/rpl/r/rpl_flushlog_loop.result b/mysql-test/suite/rpl/r/rpl_flushlog_loop.result
--- a/mysql-test/suite/rpl/r/rpl_flushlog_loop.result	2007-06-27 14:28:28 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_flushlog_loop.result	2007-10-13 22:40:58 +02:00
@@ -24,7 +24,7 @@ Master_User	root
 Master_Port	SLAVE_PORT
 Connect_Retry	60
 Master_Log_File	slave-bin.000001
-Read_Master_Log_Pos	216
+Read_Master_Log_Pos	217
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	slave-bin.000001
@@ -39,7 +39,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	216
+Exec_Master_Log_Pos	217
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
diff -Nrup a/mysql-test/suite/rpl/r/rpl_grant.result b/mysql-test/suite/rpl/r/rpl_grant.result
--- a/mysql-test/suite/rpl/r/rpl_grant.result	2007-06-27 14:44:13 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_grant.result	2007-10-13 22:40:58 +02:00
@@ -48,7 +48,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	617
+Read_Master_Log_Pos	618
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -63,7 +63,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	617
+Exec_Master_Log_Pos	618
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
diff -Nrup a/mysql-test/suite/rpl/r/rpl_heartbeat.result b/mysql-test/suite/rpl/r/rpl_heartbeat.result
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/rpl/r/rpl_heartbeat.result	2007-10-13 22:41:06 +02:00
@@ -0,0 +1,137 @@
+reset master;
+set @@global.slave_net_timeout= 10;
+change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root';
+show status like 'Slave_heartbeat_period';;
+Variable_name	Slave_heartbeat_period
+Value	5.000
+change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 4294968;
+ERROR HY000: The requested value for the heartbeat period  is negative or exceeds the maximum  4294967 seconds
+show status like 'Slave_heartbeat_period';;
+Variable_name	Slave_heartbeat_period
+Value	5.000
+change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 0.0009999;
+Warnings:
+Warning	1605	The requested value for the heartbeat period  is less than 1 msec.  The period is reset to zero which means no heartbeats will be sending
+show status like 'Slave_heartbeat_period';;
+Variable_name	Slave_heartbeat_period
+Value	0.000
+change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 4294967;
+Warnings:
+Warning	1605	The requested value for the heartbeat period  exceeds the value of `slave_net_timeout' sec.  A sensible value for the period should be less than the timeout.
+show status like 'Slave_heartbeat_period';;
+Variable_name	Slave_heartbeat_period
+Value	4294967.000
+change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 0.001;
+show status like 'Slave_heartbeat_period';;
+Variable_name	Slave_heartbeat_period
+Value	0.001
+reset slave;
+set @@global.slave_net_timeout= 5;
+change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 5.001;
+Warnings:
+Warning	1605	The requested value for the heartbeat period  exceeds the value of `slave_net_timeout' sec.  A sensible value for the period should be less than the timeout.
+show status like 'Slave_heartbeat_period';;
+Variable_name	Slave_heartbeat_period
+Value	5.001
+reset slave;
+set @@global.slave_net_timeout= 5;
+change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 4;
+show status like 'Slave_heartbeat_period';;
+Variable_name	Slave_heartbeat_period
+Value	4.000
+set @@global.slave_net_timeout= 3 /* must be a warning */;
+Warnings:
+Warning	1605	The currect value for master_heartbeat_period exceeds the new value of `slave_net_timeout' sec. A sensible value for the period should be less than the timeout.
+reset slave;
+drop table if exists t1;
+set @@global.slave_net_timeout= 10;
+change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 0.5;
+show status like 'Slave_heartbeat_period';;
+Variable_name	Slave_heartbeat_period
+Value	0.500
+start slave;
+create table t1 (f1 int);
+SHOW SLAVE STATUS;
+Slave_IO_State	#
+Master_Host	127.0.0.1
+Master_User	root
+Master_Port	MASTER_PORT
+Connect_Retry	1
+Master_Log_File	master-bin.000001
+Read_Master_Log_Pos	280
+Relay_Log_File	#
+Relay_Log_Pos	#
+Relay_Master_Log_File	master-bin.000001
+Slave_IO_Running	Yes
+Slave_SQL_Running	Yes
+Replicate_Do_DB	
+Replicate_Ignore_DB	
+Replicate_Do_Table	
+Replicate_Ignore_Table	#
+Replicate_Wild_Do_Table	
+Replicate_Wild_Ignore_Table	
+Last_Errno	0
+Last_Error	
+Skip_Counter	0
+Exec_Master_Log_Pos	280
+Relay_Log_Space	#
+Until_Condition	None
+Until_Log_File	
+Until_Log_Pos	0
+Master_SSL_Allowed	No
+Master_SSL_CA_File	
+Master_SSL_CA_Path	
+Master_SSL_Cert	
+Master_SSL_Cipher	
+Master_SSL_Key	
+Seconds_Behind_Master	#
+Master_SSL_Verify_Server_Cert	No
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	0
+Last_SQL_Error	
+SHOW SLAVE STATUS;
+Slave_IO_State	#
+Master_Host	127.0.0.1
+Master_User	root
+Master_Port	MASTER_PORT
+Connect_Retry	1
+Master_Log_File	master-bin.000001
+Read_Master_Log_Pos	280
+Relay_Log_File	#
+Relay_Log_Pos	#
+Relay_Master_Log_File	master-bin.000001
+Slave_IO_Running	Yes
+Slave_SQL_Running	Yes
+Replicate_Do_DB	
+Replicate_Ignore_DB	
+Replicate_Do_Table	
+Replicate_Ignore_Table	#
+Replicate_Wild_Do_Table	
+Replicate_Wild_Ignore_Table	
+Last_Errno	0
+Last_Error	
+Skip_Counter	0
+Exec_Master_Log_Pos	280
+Relay_Log_Space	#
+Until_Condition	None
+Until_Log_File	
+Until_Log_Pos	0
+Master_SSL_Allowed	No
+Master_SSL_CA_File	
+Master_SSL_CA_Path	
+Master_SSL_Cert	
+Master_SSL_Cipher	
+Master_SSL_Key	
+Seconds_Behind_Master	#
+Master_SSL_Verify_Server_Cert	No
+Last_IO_Errno	#
+Last_IO_Error	#
+Last_SQL_Errno	0
+Last_SQL_Error	
+show status like 'Slave_heartbeat_period';;
+Variable_name	Slave_heartbeat_period
+Value	0.500
+A heartbeat has been received by the slave
+drop table t1;
+End of tests
diff -Nrup a/mysql-test/suite/rpl/r/rpl_innodb_bug28430.result b/mysql-test/suite/rpl/r/rpl_innodb_bug28430.result
--- a/mysql-test/suite/rpl/r/rpl_innodb_bug28430.result	2007-09-13 18:34:17 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_innodb_bug28430.result	2007-10-13 22:40:59 +02:00
@@ -121,9 +121,9 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	945470
+Read_Master_Log_Pos	945471
 Relay_Log_File	slave-relay-bin.000003
-Relay_Log_Pos	945616
+Relay_Log_Pos	945618
 Relay_Master_Log_File	master-bin.000001
 Slave_IO_Running	Yes
 Slave_SQL_Running	Yes
@@ -136,8 +136,8 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	945470
-Relay_Log_Space	945771
+Exec_Master_Log_Pos	945471
+Relay_Log_Space	945774
 Until_Condition	None
 Until_Log_File	
 Until_Log_Pos	0
diff -Nrup a/mysql-test/suite/rpl/r/rpl_known_bugs_detection.result b/mysql-test/suite/rpl/r/rpl_known_bugs_detection.result
--- a/mysql-test/suite/rpl/r/rpl_known_bugs_detection.result	2007-06-27 14:28:28 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_known_bugs_detection.result	2007-10-13 22:40:59 +02:00
@@ -33,7 +33,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	1105
 Last_Error	Error 'master may suffer from http://bugs.mysql.com/bug.php?id=24432 so slave stops; check error log on slave for more info' on query. Default database: 'test'. Query: 'INSERT INTO t1(b) VALUES(1),(1),(2) ON DUPLICATE KEY UPDATE t1.b=10'
 Skip_Counter	0
-Exec_Master_Log_Pos	246
+Exec_Master_Log_Pos	247
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
@@ -120,7 +120,7 @@ FROM t2
 ON DUPLICATE KEY UPDATE
 t1.field_3 = t2.field_c'
 Skip_Counter	0
-Exec_Master_Log_Pos	1278
+Exec_Master_Log_Pos	1279
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
diff -Nrup a/mysql-test/suite/rpl/r/rpl_loaddata.result b/mysql-test/suite/rpl/r/rpl_loaddata.result
--- a/mysql-test/suite/rpl/r/rpl_loaddata.result	2007-06-27 14:28:28 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_loaddata.result	2007-10-13 22:40:59 +02:00
@@ -28,7 +28,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	1280		
+slave-bin.000001	1281		
 drop table t1;
 drop table t2;
 drop table t3;
@@ -37,9 +37,45 @@ insert into t1 values(1,10);
 load data infile '../std_data_ln/rpl_loaddata.dat' into table t1;
 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	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error
-#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	1797	#	#	master-bin.000001	Yes	Yes				#			0		0	1797	#	None		0	No						#	No	0		0	
+show slave status;;
+Slave_IO_State	#
+Master_Host	127.0.0.1
+Master_User	root
+Master_Port	MASTER_PORT
+Connect_Retry	1
+Master_Log_File	master-bin.000001
+Read_Master_Log_Pos	1798
+Relay_Log_File	#
+Relay_Log_Pos	#
+Relay_Master_Log_File	master-bin.000001
+Slave_IO_Running	Yes
+Slave_SQL_Running	Yes
+Replicate_Do_DB	
+Replicate_Ignore_DB	
+Replicate_Do_Table	
+Replicate_Ignore_Table	#
+Replicate_Wild_Do_Table	
+Replicate_Wild_Ignore_Table	
+Last_Errno	0
+Last_Error	
+Skip_Counter	0
+Exec_Master_Log_Pos	1798
+Relay_Log_Space	#
+Until_Condition	None
+Until_Log_File	
+Until_Log_Pos	0
+Master_SSL_Allowed	No
+Master_SSL_CA_File	
+Master_SSL_CA_Path	
+Master_SSL_Cert	
+Master_SSL_Cipher	
+Master_SSL_Key	
+Seconds_Behind_Master	#
+Master_SSL_Verify_Server_Cert	No
+Last_IO_Errno	0
+Last_IO_Error	
+Last_SQL_Errno	0
+Last_SQL_Error	
 set sql_log_bin=0;
 delete from t1;
 set sql_log_bin=1;
@@ -47,9 +83,45 @@ load data infile '../std_data_ln/rpl_loa
 stop slave;
 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	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error
-#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	1832	#	#	master-bin.000001	No	No				#			0		0	1832	#	None		0	No						#	No	0		0	
+show slave status;;
+Slave_IO_State	#
+Master_Host	127.0.0.1
+Master_User	root
+Master_Port	MASTER_PORT
+Connect_Retry	1
+Master_Log_File	master-bin.000001
+Read_Master_Log_Pos	1833
+Relay_Log_File	#
+Relay_Log_Pos	#
+Relay_Master_Log_File	master-bin.000001
+Slave_IO_Running	No
+Slave_SQL_Running	No
+Replicate_Do_DB	
+Replicate_Ignore_DB	
+Replicate_Do_Table	
+Replicate_Ignore_Table	#
+Replicate_Wild_Do_Table	
+Replicate_Wild_Ignore_Table	
+Last_Errno	0
+Last_Error	
+Skip_Counter	0
+Exec_Master_Log_Pos	1833
+Relay_Log_Space	#
+Until_Condition	None
+Until_Log_File	
+Until_Log_Pos	0
+Master_SSL_Allowed	No
+Master_SSL_CA_File	
+Master_SSL_CA_Path	
+Master_SSL_Cert	
+Master_SSL_Cipher	
+Master_SSL_Key	
+Seconds_Behind_Master	#
+Master_SSL_Verify_Server_Cert	No
+Last_IO_Errno	0
+Last_IO_Error	
+Last_SQL_Errno	0
+Last_SQL_Error	
 set global sql_slave_skip_counter=1;
 start slave;
 set sql_log_bin=0;
@@ -58,9 +130,45 @@ set sql_log_bin=1;
 load data infile '../std_data_ln/rpl_loaddata.dat' into table t1;
 stop slave;
 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	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error
-#	127.0.0.1	root	MASTER_PORT	1		4	#	#		No	No				#			0		0	0	#	None		0	No						#	No	0		0	
+show slave status;;
+Slave_IO_State	#
+Master_Host	127.0.0.1
+Master_User	root
+Master_Port	MASTER_PORT
+Connect_Retry	1
+Master_Log_File	
+Read_Master_Log_Pos	4
+Relay_Log_File	#
+Relay_Log_Pos	#
+Relay_Master_Log_File	
+Slave_IO_Running	No
+Slave_SQL_Running	No
+Replicate_Do_DB	
+Replicate_Ignore_DB	
+Replicate_Do_Table	
+Replicate_Ignore_Table	#
+Replicate_Wild_Do_Table	
+Replicate_Wild_Ignore_Table	
+Last_Errno	0
+Last_Error	
+Skip_Counter	0
+Exec_Master_Log_Pos	0
+Relay_Log_Space	#
+Until_Condition	None
+Until_Log_File	
+Until_Log_Pos	0
+Master_SSL_Allowed	No
+Master_SSL_CA_File	
+Master_SSL_CA_Path	
+Master_SSL_Cert	
+Master_SSL_Cipher	
+Master_SSL_Key	
+Seconds_Behind_Master	#
+Master_SSL_Verify_Server_Cert	No
+Last_IO_Errno	0
+Last_IO_Error	
+Last_SQL_Errno	0
+Last_SQL_Error	
 reset master;
 create table t2 (day date,id int(9),category enum('a','b','c'),name varchar(60),
 unique(day)) engine=MyISAM;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_loaddata_fatal.result b/mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
--- a/mysql-test/suite/rpl/r/rpl_loaddata_fatal.result	2007-06-27 14:44:13 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_loaddata_fatal.result	2007-10-13 22:40:59 +02:00
@@ -13,7 +13,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	290
+Read_Master_Log_Pos	291
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -28,7 +28,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	290
+Exec_Master_Log_Pos	291
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
@@ -53,7 +53,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	465
+Read_Master_Log_Pos	466
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -68,7 +68,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	1590
 Last_Error	Fatal error: Not enough memory
 Skip_Counter	0
-Exec_Master_Log_Pos	325
+Exec_Master_Log_Pos	326
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
diff -Nrup a/mysql-test/suite/rpl/r/rpl_log_pos.result b/mysql-test/suite/rpl/r/rpl_log_pos.result
--- a/mysql-test/suite/rpl/r/rpl_log_pos.result	2007-06-27 14:28:29 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_log_pos.result	2007-10-13 22:40:59 +02:00
@@ -6,9 +6,9 @@ drop table if exists t1,t2,t3,t4,t5,t6,t
 start slave;
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	106	<Binlog_Ignore_DB>	
+master-bin.000001	107	<Binlog_Ignore_DB>	
 stop slave;
-change master to master_log_pos=75;
+change master to master_log_pos=76;
 SHOW SLAVE STATUS;
 Slave_IO_State	#
 Master_Host	127.0.0.1
@@ -16,7 +16,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	75
+Read_Master_Log_Pos	76
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -31,7 +31,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	75
+Exec_Master_Log_Pos	76
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
@@ -57,7 +57,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	75
+Read_Master_Log_Pos	76
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -72,7 +72,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	75
+Exec_Master_Log_Pos	76
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
@@ -91,12 +91,12 @@ Last_SQL_Errno	0
 Last_SQL_Error	
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000001	106	<Binlog_Ignore_DB>	
+master-bin.000001	107	<Binlog_Ignore_DB>	
 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);
-change master to master_log_pos=106;
+change master to master_log_pos=107;
 start slave;
 select * from t1 ORDER BY n;
 n
diff -Nrup a/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result b/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result
--- a/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result	2007-07-30 13:32:03 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result	2007-10-13 22:40:59 +02:00
@@ -28,7 +28,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	457
+Read_Master_Log_Pos	458
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -43,7 +43,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	457
+Exec_Master_Log_Pos	458
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
diff -Nrup a/mysql-test/suite/rpl/r/rpl_rotate_logs.result b/mysql-test/suite/rpl/r/rpl_rotate_logs.result
--- a/mysql-test/suite/rpl/r/rpl_rotate_logs.result	2007-07-07 09:04:08 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_rotate_logs.result	2007-10-13 22:40:59 +02:00
@@ -21,7 +21,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	60
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	556
+Read_Master_Log_Pos	557
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -36,7 +36,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	556
+Exec_Master_Log_Pos	557
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
@@ -63,9 +63,9 @@ insert into t2 values (34),(67),(123);
 flush logs;
 show binary logs;
 Log_name	File_size
-master-bin.000001	600
-master-bin.000002	371
-master-bin.000003	106
+master-bin.000001	601
+master-bin.000002	372
+master-bin.000003	107
 create table t3 select * from temp_table;
 select * from t3;
 a
@@ -79,20 +79,20 @@ start slave;
 purge master logs to 'master-bin.000002';
 show master logs;
 Log_name	File_size
-master-bin.000002	371
-master-bin.000003	415
+master-bin.000002	372
+master-bin.000003	416
 purge binary logs to 'master-bin.000002';
 show binary logs;
 Log_name	File_size
-master-bin.000002	371
-master-bin.000003	415
+master-bin.000002	372
+master-bin.000003	416
 select @time_for_purge:=DATE_ADD(UPDATE_TIME, INTERVAL 1 SECOND)
 from information_schema.tables
 where TABLE_SCHEMA="test" and TABLE_NAME="t2";
 purge master logs before (@time_for_purge);
 show binary logs;
 Log_name	File_size
-master-bin.000003	415
+master-bin.000003	416
 insert into t2 values (65);
 SHOW SLAVE STATUS;
 Slave_IO_State	#
@@ -101,7 +101,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	60
 Master_Log_File	master-bin.000003
-Read_Master_Log_Pos	504
+Read_Master_Log_Pos	505
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000003
@@ -116,7 +116,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	504
+Exec_Master_Log_Pos	505
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
@@ -149,12 +149,12 @@ count(*)
 create table t4 select * from temp_table;
 show binary logs;
 Log_name	File_size
-master-bin.000003	4193
-master-bin.000004	4198
-master-bin.000005	2040
+master-bin.000003	4194
+master-bin.000004	4199
+master-bin.000005	2041
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
-master-bin.000005	2040		
+master-bin.000005	2041		
 select * from t4;
 a
 testing temporary tables part 2
@@ -165,7 +165,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	60
 Master_Log_File	master-bin.000005
-Read_Master_Log_Pos	2040
+Read_Master_Log_Pos	2041
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000005
@@ -180,7 +180,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	2040
+Exec_Master_Log_Pos	2041
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
diff -Nrup a/mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result b/mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result
--- a/mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result	2007-07-30 00:10:15 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result	2007-10-13 22:40:59 +02:00
@@ -54,10 +54,10 @@ DELETE FROM t1 WHERE a = 0;
 UPDATE t1 SET a=99 WHERE a = 0;
 SHOW BINLOG EVENTS;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	4	Format_desc	1	106	Server ver: SERVER_VERSION, Binlog ver: 4
-master-bin.000001	106	Query	1	192	use `test`; CREATE TABLE t1 (a INT)
-master-bin.000001	192	Table_map	1	233	table_id: # (test.t1)
-master-bin.000001	233	Write_rows	1	272	table_id: # flags: STMT_END_F
+master-bin.000001	4	Format_desc	1	107	Server ver: SERVER_VERSION, Binlog ver: 4
+master-bin.000001	107	Query	1	193	use `test`; CREATE TABLE t1 (a INT)
+master-bin.000001	193	Table_map	1	234	table_id: # (test.t1)
+master-bin.000001	234	Write_rows	1	273	table_id: # flags: STMT_END_F
 DROP TABLE t1;
 ================ Test for BUG#17620 ================
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_row_create_table.result b/mysql-test/suite/rpl/r/rpl_row_create_table.result
--- a/mysql-test/suite/rpl/r/rpl_row_create_table.result	2007-08-02 22:15:03 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_row_create_table.result	2007-10-13 22:40:59 +02:00
@@ -8,30 +8,30 @@ CREATE TABLE t1 (a INT, b INT);
 CREATE TABLE t2 (a INT, b INT) ENGINE=Merge;
 CREATE TABLE t3 (a INT, b INT) CHARSET=utf8;
 CREATE TABLE t4 (a INT, b INT) ENGINE=Merge CHARSET=utf8;
-SHOW BINLOG EVENTS FROM 216;
+SHOW BINLOG EVENTS FROM 217;
 Log_name	#
-Pos	216
+Pos	217
 Event_type	Query
 Server_id	#
-End_log_pos	309
+End_log_pos	310
 Info	use `test`; CREATE TABLE t1 (a INT, b INT)
 Log_name	#
-Pos	309
+Pos	310
 Event_type	Query
 Server_id	#
-End_log_pos	415
+End_log_pos	416
 Info	use `test`; CREATE TABLE t2 (a INT, b INT) ENGINE=Merge
 Log_name	#
-Pos	415
+Pos	416
 Event_type	Query
 Server_id	#
-End_log_pos	521
+End_log_pos	522
 Info	use `test`; CREATE TABLE t3 (a INT, b INT) CHARSET=utf8
 Log_name	#
-Pos	521
+Pos	522
 Event_type	Query
 Server_id	#
-End_log_pos	640
+End_log_pos	641
 Info	use `test`; CREATE TABLE t4 (a INT, b INT) ENGINE=Merge CHARSET=utf8
 **** On Master ****
 SHOW CREATE TABLE t1;
@@ -127,7 +127,7 @@ NULL	5	10
 NULL	6	12
 CREATE TABLE t7 (UNIQUE(b)) SELECT a,b FROM tt3;
 ERROR 23000: Duplicate entry '2' for key 'b'
-SHOW BINLOG EVENTS FROM 1100;
+SHOW BINLOG EVENTS FROM 1101;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 CREATE TABLE t7 (a INT, b INT UNIQUE);
 INSERT INTO t7 SELECT a,b FROM tt3;
@@ -137,11 +137,11 @@ a	b
 1	2
 2	4
 3	6
-SHOW BINLOG EVENTS FROM 1100;
+SHOW BINLOG EVENTS FROM 1101;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-#	1100	Query	#	1200	use `test`; CREATE TABLE t7 (a INT, b INT UNIQUE)
-#	1200	Table_map	#	1242	table_id: # (test.t7)
-#	1242	Write_rows	#	1298	table_id: # flags: STMT_END_F
+#	1101	Query	#	1201	use `test`; CREATE TABLE t7 (a INT, b INT UNIQUE)
+#	1201	Table_map	#	1243	table_id: # (test.t7)
+#	1243	Write_rows	#	1299	table_id: # flags: STMT_END_F
 SELECT * FROM t7 ORDER BY a,b;
 a	b
 1	2
@@ -154,10 +154,10 @@ INSERT INTO t7 SELECT a,b FROM tt4;
 ROLLBACK;
 Warnings:
 Warning	1196	Some non-transactional changed tables couldn't be rolled back
-SHOW BINLOG EVENTS FROM 1298;
+SHOW BINLOG EVENTS FROM 1299;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-#	1298	Table_map	#	1340	table_id: # (test.t7)
-#	1340	Write_rows	#	1396	table_id: # flags: STMT_END_F
+#	1299	Table_map	#	1341	table_id: # (test.t7)
+#	1341	Write_rows	#	1397	table_id: # flags: STMT_END_F
 SELECT * FROM t7 ORDER BY a,b;
 a	b
 1	2
@@ -192,10 +192,10 @@ Create Table	CREATE TABLE `t9` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-SHOW BINLOG EVENTS FROM 1396;
+SHOW BINLOG EVENTS FROM 1397;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-#	1396	Query	#	1482	use `test`; CREATE TABLE t8 LIKE t4
-#	1482	Query	#	1621	use `test`; CREATE TABLE `t9` (
+#	1397	Query	#	1483	use `test`; CREATE TABLE t8 LIKE t4
+#	1483	Query	#	1622	use `test`; CREATE TABLE `t9` (
   `a` int(11) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 )
@@ -274,33 +274,33 @@ a
 3
 SHOW BINLOG EVENTS;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-#	4	Format_desc	#	106	Server ver: #, Binlog ver: #
-#	106	Query	#	192	use `test`; CREATE TABLE t1 (a INT)
-#	192	Table_map	#	233	table_id: # (test.t1)
-#	233	Write_rows	#	277	table_id: # flags: STMT_END_F
-#	277	Query	#	345	use `test`; BEGIN
-#	345	Query	#	470	use `test`; CREATE TABLE `t2` (
+#	4	Format_desc	#	107	Server ver: #, Binlog ver: #
+#	107	Query	#	193	use `test`; CREATE TABLE t1 (a INT)
+#	193	Table_map	#	234	table_id: # (test.t1)
+#	234	Write_rows	#	278	table_id: # flags: STMT_END_F
+#	278	Query	#	346	use `test`; BEGIN
+#	346	Query	#	471	use `test`; CREATE TABLE `t2` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB
-#	470	Table_map	#	511	table_id: # (test.t2)
-#	511	Write_rows	#	555	table_id: # flags: STMT_END_F
-#	555	Xid	#	582	COMMIT /* XID */
-#	582	Query	#	650	use `test`; BEGIN
-#	650	Query	#	775	use `test`; CREATE TABLE `t3` (
+#	471	Table_map	#	512	table_id: # (test.t2)
+#	512	Write_rows	#	556	table_id: # flags: STMT_END_F
+#	556	Xid	#	583	COMMIT /* XID */
+#	583	Query	#	651	use `test`; BEGIN
+#	651	Query	#	776	use `test`; CREATE TABLE `t3` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB
-#	775	Table_map	#	816	table_id: # (test.t3)
-#	816	Write_rows	#	860	table_id: # flags: STMT_END_F
-#	860	Xid	#	887	COMMIT /* XID */
-#	887	Query	#	955	use `test`; BEGIN
-#	955	Query	#	1080	use `test`; CREATE TABLE `t4` (
+#	776	Table_map	#	817	table_id: # (test.t3)
+#	817	Write_rows	#	861	table_id: # flags: STMT_END_F
+#	861	Xid	#	888	COMMIT /* XID */
+#	888	Query	#	956	use `test`; BEGIN
+#	956	Query	#	1081	use `test`; CREATE TABLE `t4` (
   `a` int(11) DEFAULT NULL
 ) ENGINE=InnoDB
-#	1080	Table_map	#	1121	table_id: # (test.t4)
-#	1121	Write_rows	#	1165	table_id: # flags: STMT_END_F
-#	1165	Xid	#	1192	COMMIT /* XID */
-#	1192	Table_map	#	1233	table_id: # (test.t1)
-#	1233	Write_rows	#	1277	table_id: # flags: STMT_END_F
+#	1081	Table_map	#	1122	table_id: # (test.t4)
+#	1122	Write_rows	#	1166	table_id: # flags: STMT_END_F
+#	1166	Xid	#	1193	COMMIT /* XID */
+#	1193	Table_map	#	1234	table_id: # (test.t1)
+#	1234	Write_rows	#	1278	table_id: # flags: STMT_END_F
 SHOW TABLES;
 Tables_in_test
 t1
@@ -365,17 +365,17 @@ a
 9
 SHOW BINLOG EVENTS;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-#	4	Format_desc	#	106	Server ver: #, Binlog ver: #
-#	106	Query	#	192	use `test`; CREATE TABLE t1 (a INT)
-#	192	Table_map	#	233	table_id: # (test.t1)
-#	233	Write_rows	#	277	table_id: # flags: STMT_END_F
-#	277	Query	#	377	use `test`; CREATE TABLE t2 (a INT) ENGINE=INNODB
-#	377	Query	#	445	use `test`; BEGIN
-#	445	Table_map	#	486	table_id: # (test.t2)
-#	486	Write_rows	#	530	table_id: # flags: STMT_END_F
-#	530	Table_map	#	571	table_id: # (test.t2)
-#	571	Write_rows	#	610	table_id: # flags: STMT_END_F
-#	610	Xid	#	637	COMMIT /* XID */
+#	4	Format_desc	#	107	Server ver: #, Binlog ver: #
+#	107	Query	#	193	use `test`; CREATE TABLE t1 (a INT)
+#	193	Table_map	#	234	table_id: # (test.t1)
+#	234	Write_rows	#	278	table_id: # flags: STMT_END_F
+#	278	Query	#	378	use `test`; CREATE TABLE t2 (a INT) ENGINE=INNODB
+#	378	Query	#	446	use `test`; BEGIN
+#	446	Table_map	#	487	table_id: # (test.t2)
+#	487	Write_rows	#	531	table_id: # flags: STMT_END_F
+#	531	Table_map	#	572	table_id: # (test.t2)
+#	572	Write_rows	#	611	table_id: # flags: STMT_END_F
+#	611	Xid	#	638	COMMIT /* XID */
 SELECT * FROM t2 ORDER BY a;
 a
 1
@@ -396,16 +396,16 @@ Warnings:
 Warning	1196	Some non-transactional changed tables couldn't be rolled back
 SELECT * FROM t2 ORDER BY a;
 a
-SHOW BINLOG EVENTS FROM 637;
+SHOW BINLOG EVENTS FROM 638;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-#	637	Query	#	717	use `test`; TRUNCATE TABLE t2
-#	717	Xid	#	744	COMMIT /* XID */
-#	744	Query	#	812	use `test`; BEGIN
-#	812	Table_map	#	853	table_id: # (test.t2)
-#	853	Write_rows	#	897	table_id: # flags: STMT_END_F
-#	897	Table_map	#	938	table_id: # (test.t2)
-#	938	Write_rows	#	977	table_id: # flags: STMT_END_F
-#	977	Query	#	1048	use `test`; ROLLBACK
+#	638	Query	#	718	use `test`; TRUNCATE TABLE t2
+#	718	Xid	#	745	COMMIT /* XID */
+#	745	Query	#	813	use `test`; BEGIN
+#	813	Table_map	#	854	table_id: # (test.t2)
+#	854	Write_rows	#	898	table_id: # flags: STMT_END_F
+#	898	Table_map	#	939	table_id: # (test.t2)
+#	939	Write_rows	#	978	table_id: # flags: STMT_END_F
+#	978	Query	#	1049	use `test`; ROLLBACK
 SELECT * FROM t2 ORDER BY a;
 a
 DROP TABLE t1,t2;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_row_drop.result b/mysql-test/suite/rpl/r/rpl_row_drop.result
--- a/mysql-test/suite/rpl/r/rpl_row_drop.result	2007-06-27 14:27:29 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_row_drop.result	2007-10-13 22:41:00 +02:00
@@ -43,10 +43,10 @@ t2
 DROP TABLE t1,t2;
 SHOW BINLOG EVENTS;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	4	Format_desc	1	106	Server ver: VERSION, Binlog ver: 4
-master-bin.000001	106	Query	1	192	use `test`; CREATE TABLE t1 (a int)
-master-bin.000001	192	Query	1	278	use `test`; CREATE TABLE t2 (a int)
-master-bin.000001	278	Query	1	382	use `test`; DROP TABLE `t1` /* generated by server */
+master-bin.000001	4	Format_desc	1	107	Server ver: VERSION, Binlog ver: 4
+master-bin.000001	107	Query	1	193	use `test`; CREATE TABLE t1 (a int)
+master-bin.000001	193	Query	1	279	use `test`; CREATE TABLE t2 (a int)
+master-bin.000001	279	Query	1	383	use `test`; DROP TABLE `t1` /* generated by server */
 SHOW TABLES;
 Tables_in_test
 t2
diff -Nrup a/mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result b/mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result
--- a/mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result	2007-07-30 00:10:16 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result	2007-10-13 22:41:00 +02:00
@@ -12,13 +12,13 @@ create table t4 (a int);
 insert into t4 select * from t3;
 rename table t1 to t5, t2 to t1;
 flush no_write_to_binlog tables;
-SHOW BINLOG EVENTS FROM 623 ;
+SHOW BINLOG EVENTS FROM 624 ;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	1	#	use `test`; rename table t1 to t5, t2 to t1
 select * from t3;
 a
 flush tables;
-SHOW BINLOG EVENTS FROM 623 ;
+SHOW BINLOG EVENTS FROM 624 ;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	1	#	use `test`; rename table t1 to t5, t2 to t1
 master-bin.000001	#	Query	1	#	use `test`; flush tables
diff -Nrup a/mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result b/mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result
--- a/mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result	2007-07-30 00:10:16 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result	2007-10-13 22:41:00 +02:00
@@ -24,7 +24,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	605
+Read_Master_Log_Pos	606
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -39,7 +39,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	1146
 Last_Error	Error 'Table 'test.t1' doesn't exist' on opening table `test`.`t1`
 Skip_Counter	0
-Exec_Master_Log_Pos	530
+Exec_Master_Log_Pos	531
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
diff -Nrup a/mysql-test/suite/rpl/r/rpl_row_log.result b/mysql-test/suite/rpl/r/rpl_row_log.result
--- a/mysql-test/suite/rpl/r/rpl_row_log.result	2007-07-30 00:10:17 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_row_log.result	2007-10-13 22:41:00 +02:00
@@ -26,14 +26,14 @@ master-bin.000001	#	Query	1	#	use `test`
 master-bin.000001	#	Query	1	#	use `test`; create table t1 (word char(20) not null)ENGINE=MyISAM
 master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
-show binlog events from 106 limit 1;
+show binlog events from 107 limit 1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
-show binlog events from 106 limit 2;
+show binlog events from 107 limit 2;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
 master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-show binlog events from 106 limit 2,1;
+show binlog events from 107 limit 2,1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
 flush logs;
@@ -208,13 +208,13 @@ master-bin.000002	#	Table_map	1	#	table_
 master-bin.000002	#	Write_rows	1	#	table_id: # flags: STMT_END_F
 show binary logs;
 Log_name	File_size
-master-bin.000001	1266
-master-bin.000002	379
+master-bin.000001	1267
+master-bin.000002	380
 start slave;
 show binary logs;
 Log_name	File_size
-slave-bin.000001	1364
-slave-bin.000002	280
+slave-bin.000001	1365
+slave-bin.000002	281
 show binlog events in 'slave-bin.000001' from 4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
@@ -240,7 +240,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000002
-Read_Master_Log_Pos	379
+Read_Master_Log_Pos	380
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000002
@@ -255,7 +255,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	379
+Exec_Master_Log_Pos	380
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
diff -Nrup a/mysql-test/suite/rpl/r/rpl_row_log_innodb.result b/mysql-test/suite/rpl/r/rpl_row_log_innodb.result
--- a/mysql-test/suite/rpl/r/rpl_row_log_innodb.result	2007-07-30 00:10:17 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_row_log_innodb.result	2007-10-13 22:41:00 +02:00
@@ -28,14 +28,14 @@ master-bin.000001	#	Query	1	#	use `test`
 master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
 master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	1	#	COMMIT /* XID */
-show binlog events from 106 limit 1;
+show binlog events from 107 limit 1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=InnoDB
-show binlog events from 106 limit 2;
+show binlog events from 107 limit 2;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=InnoDB
 master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
-show binlog events from 106 limit 2,1;
+show binlog events from 107 limit 2,1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
 flush logs;
@@ -213,13 +213,13 @@ master-bin.000002	#	Write_rows	1	#	table
 master-bin.000002	#	Xid	1	#	COMMIT /* XID */
 show binary logs;
 Log_name	File_size
-master-bin.000001	1320
-master-bin.000002	406
+master-bin.000001	1321
+master-bin.000002	407
 start slave;
 show binary logs;
 Log_name	File_size
-slave-bin.000001	1418
-slave-bin.000002	307
+slave-bin.000001	1419
+slave-bin.000002	308
 show binlog events in 'slave-bin.000001' from 4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
@@ -248,7 +248,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000002
-Read_Master_Log_Pos	406
+Read_Master_Log_Pos	407
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000002
@@ -263,7 +263,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	406
+Exec_Master_Log_Pos	407
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
diff -Nrup a/mysql-test/suite/rpl/r/rpl_row_max_relay_size.result b/mysql-test/suite/rpl/r/rpl_row_max_relay_size.result
--- a/mysql-test/suite/rpl/r/rpl_row_max_relay_size.result	2007-07-30 00:10:18 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_row_max_relay_size.result	2007-10-13 22:41:00 +02:00
@@ -30,7 +30,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	60268
+Read_Master_Log_Pos	60269
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -45,7 +45,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	60268
+Exec_Master_Log_Pos	60269
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
@@ -78,7 +78,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	60268
+Read_Master_Log_Pos	60269
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -93,7 +93,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	60268
+Exec_Master_Log_Pos	60269
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
@@ -126,7 +126,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	60268
+Read_Master_Log_Pos	60269
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -141,7 +141,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	60268
+Exec_Master_Log_Pos	60269
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
@@ -217,7 +217,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	60354
+Read_Master_Log_Pos	60355
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -232,7 +232,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	60354
+Exec_Master_Log_Pos	60355
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
@@ -261,7 +261,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	60430
+Read_Master_Log_Pos	60431
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -276,7 +276,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	60430
+Exec_Master_Log_Pos	60431
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
@@ -296,7 +296,7 @@ Last_SQL_Error	
 flush logs;
 show master status;
 File	master-bin.000002
-Position	106
+Position	107
 Binlog_Do_DB	<Binlog_Ignore_DB>
 Binlog_Ignore_DB	
 set global max_binlog_size= @my_max_binlog_size;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_row_reset_slave.result b/mysql-test/suite/rpl/r/rpl_row_reset_slave.result
--- a/mysql-test/suite/rpl/r/rpl_row_reset_slave.result	2007-06-27 14:28:29 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_row_reset_slave.result	2007-10-13 22:41:00 +02:00
@@ -11,7 +11,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	106
+Read_Master_Log_Pos	107
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -26,7 +26,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	106
+Exec_Master_Log_Pos	107
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
@@ -52,7 +52,7 @@ Master_User	test
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	106
+Read_Master_Log_Pos	107
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -67,7 +67,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	106
+Exec_Master_Log_Pos	107
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
@@ -132,7 +132,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	106
+Read_Master_Log_Pos	107
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -147,7 +147,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	106
+Exec_Master_Log_Pos	107
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
diff -Nrup a/mysql-test/suite/rpl/r/rpl_row_until.result b/mysql-test/suite/rpl/r/rpl_row_until.result
--- a/mysql-test/suite/rpl/r/rpl_row_until.result	2007-07-30 00:10:20 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_row_until.result	2007-10-13 22:41:00 +02:00
@@ -26,7 +26,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	750
+Read_Master_Log_Pos	751
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -41,7 +41,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	317
+Exec_Master_Log_Pos	318
 Relay_Log_Space	#
 Until_Condition	Master
 Until_Log_File	master-bin.000001
@@ -72,7 +72,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	750
+Read_Master_Log_Pos	751
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -87,7 +87,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	317
+Exec_Master_Log_Pos	318
 Relay_Log_Space	#
 Until_Condition	Master
 Until_Log_File	master-no-such-bin.000001
@@ -116,7 +116,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	750
+Read_Master_Log_Pos	751
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -131,7 +131,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	594
+Exec_Master_Log_Pos	595
 Relay_Log_Space	#
 Until_Condition	Relay
 Until_Log_File	slave-relay-bin.000004
@@ -158,7 +158,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	750
+Read_Master_Log_Pos	751
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -173,7 +173,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	750
+Exec_Master_Log_Pos	751
 Relay_Log_Space	#
 Until_Condition	Master
 Until_Log_File	master-bin.000001
diff -Nrup a/mysql-test/suite/rpl/r/rpl_server_id1.result b/mysql-test/suite/rpl/r/rpl_server_id1.result
--- a/mysql-test/suite/rpl/r/rpl_server_id1.result	2007-06-27 14:28:29 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_server_id1.result	2007-10-13 22:41:01 +02:00
@@ -31,7 +31,7 @@ Last_Errno	0
 Last_Error	
 Skip_Counter	0
 Exec_Master_Log_Pos	0
-Relay_Log_Space	106
+Relay_Log_Space	107
 Until_Condition	None
 Until_Log_File	
 Until_Log_Pos	0
diff -Nrup a/mysql-test/suite/rpl/r/rpl_server_id2.result b/mysql-test/suite/rpl/r/rpl_server_id2.result
--- a/mysql-test/suite/rpl/r/rpl_server_id2.result	2007-06-27 14:28:29 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_server_id2.result	2007-10-13 22:41:01 +02:00
@@ -31,7 +31,7 @@ Last_Errno	0
 Last_Error	
 Skip_Counter	0
 Exec_Master_Log_Pos	0
-Relay_Log_Space	106
+Relay_Log_Space	107
 Until_Condition	None
 Until_Log_File	
 Until_Log_Pos	0
diff -Nrup a/mysql-test/suite/rpl/r/rpl_skip_error.result b/mysql-test/suite/rpl/r/rpl_skip_error.result
--- a/mysql-test/suite/rpl/r/rpl_skip_error.result	2007-07-30 00:10:20 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_skip_error.result	2007-10-13 22:41:01 +02:00
@@ -29,8 +29,43 @@ select * from t1;
 a
 1
 2
-3
-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	Master_SSL_Verify_Server_Cert	Last_IO_Errno	Last_IO_Error	Last_SQL_Errno	Last_SQL_Error
-#	127.0.0.1	root	MASTER_PORT	1	master-bin.000001	786	#	#	master-bin.000001	Yes	Yes							0		0	786	#	None		0	No						#	No	0		0	
+show slave status;;
+Slave_IO_State	#
+Master_Host	127.0.0.1
+Master_User	root
+Master_Port	MASTER_PORT
+Connect_Retry	1
+Master_Log_File	master-bin.000001
+Read_Master_Log_Pos	852
+Relay_Log_File	#
+Relay_Log_Pos	#
+Relay_Master_Log_File	master-bin.000001
+Slave_IO_Running	Yes
+Slave_SQL_Running	Yes
+Replicate_Do_DB	
+Replicate_Ignore_DB	
+Replicate_Do_Table	
+Replicate_Ignore_Table	
+Replicate_Wild_Do_Table	
+Replicate_Wild_Ignore_Table	
+Last_Errno	0
+Last_Error	
+Skip_Counter	0
+Exec_Master_Log_Pos	852
+Relay_Log_Space	#
+Until_Condition	None
+Until_Log_File	
+Until_Log_Pos	0
+Master_SSL_Allowed	No
+Master_SSL_CA_File	
+Master_SSL_CA_Path	
+Master_SSL_Cert	
+Master_SSL_Cipher	
+Master_SSL_Key	
+Seconds_Behind_Master	#
+Master_SSL_Verify_Server_Cert	No
+Last_IO_Errno	0
+Last_IO_Error	
+Last_SQL_Errno	0
+Last_SQL_Error	
 drop table t1;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_slave_skip.result b/mysql-test/suite/rpl/r/rpl_slave_skip.result
--- a/mysql-test/suite/rpl/r/rpl_slave_skip.result	2007-07-30 13:32:04 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_slave_skip.result	2007-10-13 22:41:01 +02:00
@@ -44,7 +44,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	722
+Read_Master_Log_Pos	723
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -59,7 +59,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	488
+Exec_Master_Log_Pos	489
 Relay_Log_Space	#
 Until_Condition	Master
 Until_Log_File	master-bin.000001
@@ -108,7 +108,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	248
+Read_Master_Log_Pos	249
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -123,7 +123,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	248
+Exec_Master_Log_Pos	249
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
diff -Nrup a/mysql-test/suite/rpl/r/rpl_sp.result b/mysql-test/suite/rpl/r/rpl_sp.result
--- a/mysql-test/suite/rpl/r/rpl_sp.result	2007-07-17 21:36:40 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_sp.result	2007-10-13 22:41:01 +02:00
@@ -405,116 +405,116 @@ return 0;
 end|
 use mysqltest;
 set @a:= mysqltest2.f1();
-show binlog events in 'master-bin.000001' from 106;
+show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	1	#	drop database if exists mysqltest1
-master-bin.000001	#	Query	1	#	create database mysqltest1
-master-bin.000001	#	Query	1	#	use `mysqltest1`; create table t1 (a varchar(100))
-master-bin.000001	#	Query	1	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` procedure foo()
+master-bin.000001	#	Query	#	#	drop database if exists mysqltest1
+master-bin.000001	#	Query	#	#	create database mysqltest1
+master-bin.000001	#	Query	#	#	use `mysqltest1`; create table t1 (a varchar(100))
+master-bin.000001	#	Query	#	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` procedure foo()
 begin
 declare b int;
 set b = 8;
 insert into t1 values (b);
 insert into t1 values (unix_timestamp());
 end
-master-bin.000001	#	Query	1	#	use `mysqltest1`; insert into t1 values ( NAME_CONST('b',8))
-master-bin.000001	#	Query	1	#	use `mysqltest1`; insert into t1 values (unix_timestamp())
-master-bin.000001	#	Query	1	#	use `mysqltest1`; delete from t1
-master-bin.000001	#	Query	1	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` procedure foo2()
+master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t1 values ( NAME_CONST('b',8))
+master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t1 values (unix_timestamp())
+master-bin.000001	#	Query	#	#	use `mysqltest1`; delete from t1
+master-bin.000001	#	Query	#	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` procedure foo2()
 select * from mysqltest1.t1
-master-bin.000001	#	Query	1	#	use `mysqltest1`; alter procedure foo2 contains sql
-master-bin.000001	#	Query	1	#	use `mysqltest1`; drop table t1
-master-bin.000001	#	Query	1	#	use `mysqltest1`; create table t1 (a int)
-master-bin.000001	#	Query	1	#	use `mysqltest1`; create table t2 like t1
-master-bin.000001	#	Query	1	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` procedure foo3()
+master-bin.000001	#	Query	#	#	use `mysqltest1`; alter procedure foo2 contains sql
+master-bin.000001	#	Query	#	#	use `mysqltest1`; drop table t1
+master-bin.000001	#	Query	#	#	use `mysqltest1`; create table t1 (a int)
+master-bin.000001	#	Query	#	#	use `mysqltest1`; create table t2 like t1
+master-bin.000001	#	Query	#	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` procedure foo3()
 deterministic
 insert into t1 values (15)
-master-bin.000001	#	Query	1	#	use `mysqltest1`; grant CREATE ROUTINE, EXECUTE on mysqltest1.* to "zedjzlcsjhd"@127.0.0.1
-master-bin.000001	#	Query	1	#	use `mysqltest1`; grant SELECT on mysqltest1.t1 to "zedjzlcsjhd"@127.0.0.1
-master-bin.000001	#	Query	1	#	use `mysqltest1`; grant SELECT, INSERT on mysqltest1.t2 to "zedjzlcsjhd"@127.0.0.1
-master-bin.000001	#	Query	1	#	use `mysqltest1`; CREATE DEFINER=`zedjzlcsjhd`@`127.0.0.1` procedure foo4()
+master-bin.000001	#	Query	#	#	use `mysqltest1`; grant CREATE ROUTINE, EXECUTE on mysqltest1.* to "zedjzlcsjhd"@127.0.0.1
+master-bin.000001	#	Query	#	#	use `mysqltest1`; grant SELECT on mysqltest1.t1 to "zedjzlcsjhd"@127.0.0.1
+master-bin.000001	#	Query	#	#	use `mysqltest1`; grant SELECT, INSERT on mysqltest1.t2 to "zedjzlcsjhd"@127.0.0.1
+master-bin.000001	#	Query	#	#	use `mysqltest1`; CREATE DEFINER=`zedjzlcsjhd`@`127.0.0.1` procedure foo4()
 deterministic
 begin
 insert into t2 values(3);
 insert into t1 values (5);
 end
-master-bin.000001	#	Query	1	#	use `mysqltest1`; insert into t2 values(3)
-master-bin.000001	#	Query	1	#	use `mysqltest1`; insert into t1 values (15)
-master-bin.000001	#	Query	1	#	use `mysqltest1`; insert into t2 values(3)
-master-bin.000001	#	Query	1	#	use `mysqltest1`; alter procedure foo4 sql security invoker
-master-bin.000001	#	Query	1	#	use `mysqltest1`; insert into t2 values(3)
-master-bin.000001	#	Query	1	#	use `mysqltest1`; insert into t1 values (5)
-master-bin.000001	#	Query	1	#	use `mysqltest1`; delete from t2
-master-bin.000001	#	Query	1	#	use `mysqltest1`; alter table t2 add unique (a)
-master-bin.000001	#	Query	1	#	use `mysqltest1`; drop procedure foo4
-master-bin.000001	#	Query	1	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` procedure foo4()
+master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t2 values(3)
+master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t1 values (15)
+master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t2 values(3)
+master-bin.000001	#	Query	#	#	use `mysqltest1`; alter procedure foo4 sql security invoker
+master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t2 values(3)
+master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t1 values (5)
+master-bin.000001	#	Query	#	#	use `mysqltest1`; delete from t2
+master-bin.000001	#	Query	#	#	use `mysqltest1`; alter table t2 add unique (a)
+master-bin.000001	#	Query	#	#	use `mysqltest1`; drop procedure foo4
+master-bin.000001	#	Query	#	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` procedure foo4()
 deterministic
 begin
 insert into t2 values(20),(20);
 end
-master-bin.000001	#	Query	1	#	use `mysqltest1`; insert into t2 values(20),(20)
-master-bin.000001	#	Query	1	#	use `mysqltest1`; drop procedure foo4
-master-bin.000001	#	Query	1	#	use `mysqltest1`; drop procedure foo
-master-bin.000001	#	Query	1	#	use `mysqltest1`; drop procedure foo2
-master-bin.000001	#	Query	1	#	use `mysqltest1`; drop procedure foo3
-master-bin.000001	#	Query	1	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` function fn1(x int)
+master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t2 values(20),(20)
+master-bin.000001	#	Query	#	#	use `mysqltest1`; drop procedure foo4
+master-bin.000001	#	Query	#	#	use `mysqltest1`; drop procedure foo
+master-bin.000001	#	Query	#	#	use `mysqltest1`; drop procedure foo2
+master-bin.000001	#	Query	#	#	use `mysqltest1`; drop procedure foo3
+master-bin.000001	#	Query	#	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` function fn1(x int)
 returns int
 deterministic
 begin
 insert into t1 values (x);
 return x+2;
 end
-master-bin.000001	#	Query	1	#	use `mysqltest1`; delete t1,t2 from t1,t2
-master-bin.000001	#	Query	1	#	use `mysqltest1`; SELECT `mysqltest1`.`fn1`(20)
-master-bin.000001	#	Query	1	#	use `mysqltest1`; insert into t2 values(fn1(21))
-master-bin.000001	#	Query	1	#	use `mysqltest1`; drop function fn1
-master-bin.000001	#	Query	1	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` function fn1()
+master-bin.000001	#	Query	#	#	use `mysqltest1`; delete t1,t2 from t1,t2
+master-bin.000001	#	Query	#	#	use `mysqltest1`; SELECT `mysqltest1`.`fn1`(20)
+master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t2 values(fn1(21))
+master-bin.000001	#	Query	#	#	use `mysqltest1`; drop function fn1
+master-bin.000001	#	Query	#	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` function fn1()
 returns int
 no sql
 begin
 return unix_timestamp();
 end
-master-bin.000001	#	Query	1	#	use `mysqltest1`; delete from t1
-master-bin.000001	#	Query	1	#	use `mysqltest1`; insert into t1 values(fn1())
-master-bin.000001	#	Query	1	#	use `mysqltest1`; CREATE DEFINER=`zedjzlcsjhd`@`127.0.0.1` function fn2()
+master-bin.000001	#	Query	#	#	use `mysqltest1`; delete from t1
+master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t1 values(fn1())
+master-bin.000001	#	Query	#	#	use `mysqltest1`; CREATE DEFINER=`zedjzlcsjhd`@`127.0.0.1` function fn2()
 returns int
 no sql
 begin
 return unix_timestamp();
 end
-master-bin.000001	#	Query	1	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` function fn3()
+master-bin.000001	#	Query	#	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` function fn3()
 returns int
 not deterministic
 reads sql data
 begin
 return 0;
 end
-master-bin.000001	#	Query	1	#	use `mysqltest1`; delete from t2
-master-bin.000001	#	Query	1	#	use `mysqltest1`; alter table t2 add unique (a)
-master-bin.000001	#	Query	1	#	use `mysqltest1`; drop function fn1
-master-bin.000001	#	Query	1	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` function fn1(x int)
+master-bin.000001	#	Query	#	#	use `mysqltest1`; delete from t2
+master-bin.000001	#	Query	#	#	use `mysqltest1`; alter table t2 add unique (a)
+master-bin.000001	#	Query	#	#	use `mysqltest1`; drop function fn1
+master-bin.000001	#	Query	#	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` function fn1(x int)
 returns int
 begin
 insert into t2 values(x),(x);
 return 10;
 end
-master-bin.000001	#	Query	1	#	use `mysqltest1`; SELECT `mysqltest1`.`fn1`(100)
-master-bin.000001	#	Query	1	#	use `mysqltest1`; SELECT `mysqltest1`.`fn1`(20)
-master-bin.000001	#	Query	1	#	use `mysqltest1`; delete from t1
-master-bin.000001	#	Query	1	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` trigger trg before insert on t1 for each row set new.a= 10
-master-bin.000001	#	Query	1	#	use `mysqltest1`; insert into t1 values (1)
-master-bin.000001	#	Query	1	#	use `mysqltest1`; delete from t1
-master-bin.000001	#	Query	1	#	use `mysqltest1`; drop trigger trg
-master-bin.000001	#	Query	1	#	use `mysqltest1`; insert into t1 values (1)
-master-bin.000001	#	Query	1	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` procedure foo()
+master-bin.000001	#	Query	#	#	use `mysqltest1`; SELECT `mysqltest1`.`fn1`(100)
+master-bin.000001	#	Query	#	#	use `mysqltest1`; SELECT `mysqltest1`.`fn1`(20)
+master-bin.000001	#	Query	#	#	use `mysqltest1`; delete from t1
+master-bin.000001	#	Query	#	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` trigger trg before insert on t1 for each row set new.a= 10
+master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t1 values (1)
+master-bin.000001	#	Query	#	#	use `mysqltest1`; delete from t1
+master-bin.000001	#	Query	#	#	use `mysqltest1`; drop trigger trg
+master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t1 values (1)
+master-bin.000001	#	Query	#	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` procedure foo()
 not deterministic
 reads sql data
 select * from t1
-master-bin.000001	#	Query	1	#	use `mysqltest1`; drop procedure foo
-master-bin.000001	#	Query	1	#	use `mysqltest1`; drop function fn1
-master-bin.000001	#	Query	1	#	drop database mysqltest1
-master-bin.000001	#	Query	1	#	drop user "zedjzlcsjhd"@127.0.0.1
-master-bin.000001	#	Query	1	#	use `test`; CREATE DEFINER=`root`@`localhost` function f1() returns int reads sql data
+master-bin.000001	#	Query	#	#	use `mysqltest1`; drop procedure foo
+master-bin.000001	#	Query	#	#	use `mysqltest1`; drop function fn1
+master-bin.000001	#	Query	#	#	drop database mysqltest1
+master-bin.000001	#	Query	#	#	drop user "zedjzlcsjhd"@127.0.0.1
+master-bin.000001	#	Query	#	#	use `test`; CREATE DEFINER=`root`@`localhost` function f1() returns int reads sql data
 begin
 declare var integer;
 declare c cursor for select a from v1;
@@ -523,35 +523,35 @@ fetch c into var;
 close c;
 return var;
 end
-master-bin.000001	#	Query	1	#	use `test`; CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 1 as a
-master-bin.000001	#	Query	1	#	use `test`; create table t1 (a int)
-master-bin.000001	#	Query	1	#	use `test`; insert into t1 (a) values (f1())
-master-bin.000001	#	Query	1	#	use `test`; drop view v1
-master-bin.000001	#	Query	1	#	use `test`; drop function f1
-master-bin.000001	#	Query	1	#	use `test`; DROP TABLE IF EXISTS t1
-master-bin.000001	#	Query	1	#	use `test`; CREATE TABLE t1(col VARCHAR(10))
-master-bin.000001	#	Query	1	#	use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE p1(arg VARCHAR(10))
+master-bin.000001	#	Query	#	#	use `test`; CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 1 as a
+master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int)
+master-bin.000001	#	Query	#	#	use `test`; insert into t1 (a) values (f1())
+master-bin.000001	#	Query	#	#	use `test`; drop view v1
+master-bin.000001	#	Query	#	#	use `test`; drop function f1
+master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS t1
+master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1(col VARCHAR(10))
+master-bin.000001	#	Query	#	#	use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE p1(arg VARCHAR(10))
 INSERT INTO t1 VALUES(arg)
-master-bin.000001	#	Query	1	#	use `test`; INSERT INTO t1 VALUES( NAME_CONST('arg',_latin1'test'))
-master-bin.000001	#	Query	1	#	use `test`; DROP PROCEDURE p1
-master-bin.000001	#	Query	1	#	use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE p1() SET @a = 1
-master-bin.000001	#	Query	1	#	use `test`; CREATE DEFINER=`root`@`localhost` FUNCTION f1() RETURNS INT RETURN 0
-master-bin.000001	#	Query	1	#	use `test`; DROP PROCEDURE p1
-master-bin.000001	#	Query	1	#	use `test`; DROP FUNCTION f1
-master-bin.000001	#	Query	1	#	use `test`; drop table t1
-master-bin.000001	#	Query	1	#	drop database if exists mysqltest
-master-bin.000001	#	Query	1	#	drop database if exists mysqltest2
-master-bin.000001	#	Query	1	#	create database mysqltest
-master-bin.000001	#	Query	1	#	create database mysqltest2
-master-bin.000001	#	Query	1	#	use `mysqltest2`; create table t ( t integer )
-master-bin.000001	#	Query	1	#	use `mysqltest2`; CREATE DEFINER=`root`@`localhost` procedure mysqltest.test() begin end
-master-bin.000001	#	Query	1	#	use `mysqltest2`; insert into t values ( 1 )
-master-bin.000001	#	Query	1	#	use `mysqltest2`; CREATE DEFINER=`root`@`localhost` function f1 () returns int
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES( NAME_CONST('arg',_latin1'test'))
+master-bin.000001	#	Query	#	#	use `test`; DROP PROCEDURE p1
+master-bin.000001	#	Query	#	#	use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE p1() SET @a = 1
+master-bin.000001	#	Query	#	#	use `test`; CREATE DEFINER=`root`@`localhost` FUNCTION f1() RETURNS INT RETURN 0
+master-bin.000001	#	Query	#	#	use `test`; DROP PROCEDURE p1
+master-bin.000001	#	Query	#	#	use `test`; DROP FUNCTION f1
+master-bin.000001	#	Query	#	#	use `test`; drop table t1
+master-bin.000001	#	Query	#	#	drop database if exists mysqltest
+master-bin.000001	#	Query	#	#	drop database if exists mysqltest2
+master-bin.000001	#	Query	#	#	create database mysqltest
+master-bin.000001	#	Query	#	#	create database mysqltest2
+master-bin.000001	#	Query	#	#	use `mysqltest2`; create table t ( t integer )
+master-bin.000001	#	Query	#	#	use `mysqltest2`; CREATE DEFINER=`root`@`localhost` procedure mysqltest.test() begin end
+master-bin.000001	#	Query	#	#	use `mysqltest2`; insert into t values ( 1 )
+master-bin.000001	#	Query	#	#	use `mysqltest2`; CREATE DEFINER=`root`@`localhost` function f1 () returns int
 begin
 insert into t values (1);
 return 0;
 end
-master-bin.000001	#	Query	1	#	use `mysqltest`; SELECT `mysqltest2`.`f1`()
+master-bin.000001	#	Query	#	#	use `mysqltest`; SELECT `mysqltest2`.`f1`()
 set global log_bin_trust_function_creators=0;
 set global log_bin_trust_function_creators=0;
 drop database mysqltest;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result b/mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result
--- a/mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result	2007-06-27 14:27:29 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result	2007-10-13 22:41:01 +02:00
@@ -12,13 +12,13 @@ create table t4 (a int);
 insert into t4 select * from t3;
 rename table t1 to t5, t2 to t1;
 flush no_write_to_binlog tables;
-SHOW BINLOG EVENTS FROM 656 ;
+SHOW BINLOG EVENTS FROM 657 ;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	1	#	use `test`; rename table t1 to t5, t2 to t1
 select * from t3;
 a
 flush tables;
-SHOW BINLOG EVENTS FROM 656 ;
+SHOW BINLOG EVENTS FROM 657 ;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	1	#	use `test`; rename table t1 to t5, t2 to t1
 master-bin.000001	#	Query	1	#	use `test`; flush tables
diff -Nrup a/mysql-test/suite/rpl/r/rpl_stm_log.result b/mysql-test/suite/rpl/r/rpl_stm_log.result
--- a/mysql-test/suite/rpl/r/rpl_stm_log.result	2007-07-25 15:29:29 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_stm_log.result	2007-10-13 22:41:01 +02:00
@@ -26,14 +26,14 @@ master-bin.000001	#	Query	1	#	use `test`
 master-bin.000001	#	Query	1	#	use `test`; create table t1 (word char(20) not null)ENGINE=MyISAM
 master-bin.000001	#	Begin_load_query	1	#	;file_id=1;block_len=581
 master-bin.000001	#	Execute_load_query	1	#	use `test`; load data infile '../std_data_ln/words.dat' into table t1 ignore 1 lines ;file_id=1
-show binlog events from 106 limit 1;
+show binlog events from 107 limit 1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
-show binlog events from 106 limit 2;
+show binlog events from 107 limit 2;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
 master-bin.000001	#	Intvar	1	#	INSERT_ID=1
-show binlog events from 106 limit 2,1;
+show binlog events from 107 limit 2,1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	1	#	use `test`; insert into t1 values (NULL)
 flush logs;
@@ -207,13 +207,13 @@ master-bin.000002	#	Query	1	#	use `test`
 master-bin.000002	#	Query	1	#	use `test`; insert into t2 values (1)
 show binary logs;
 Log_name	File_size
-master-bin.000001	1347
-master-bin.000002	392
+master-bin.000001	1348
+master-bin.000002	393
 start slave;
 show binary logs;
 Log_name	File_size
-slave-bin.000001	1447
-slave-bin.000002	293
+slave-bin.000001	1448
+slave-bin.000002	294
 show binlog events in 'slave-bin.000001' from 4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
@@ -238,7 +238,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000002
-Read_Master_Log_Pos	392
+Read_Master_Log_Pos	393
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000002
@@ -253,7 +253,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	392
+Exec_Master_Log_Pos	393
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
diff -Nrup a/mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result b/mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result
--- a/mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result	2007-06-27 14:28:29 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result	2007-10-13 22:41:01 +02:00
@@ -28,7 +28,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	72960
+Read_Master_Log_Pos	72961
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -43,7 +43,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	72960
+Exec_Master_Log_Pos	72961
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
@@ -76,7 +76,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	72960
+Read_Master_Log_Pos	72961
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -91,7 +91,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	72960
+Exec_Master_Log_Pos	72961
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
@@ -124,7 +124,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	72960
+Read_Master_Log_Pos	72961
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -139,7 +139,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	72960
+Exec_Master_Log_Pos	72961
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
@@ -215,7 +215,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	73046
+Read_Master_Log_Pos	73047
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -230,7 +230,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	73046
+Exec_Master_Log_Pos	73047
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
@@ -259,7 +259,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	73122
+Read_Master_Log_Pos	73123
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -274,7 +274,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	73122
+Exec_Master_Log_Pos	73123
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
@@ -294,7 +294,7 @@ Last_SQL_Error	
 flush logs;
 show master status;
 File	master-bin.000002
-Position	106
+Position	107
 Binlog_Do_DB	<Binlog_Ignore_DB>
 Binlog_Ignore_DB	
 set global max_binlog_size= @my_max_binlog_size;
diff -Nrup a/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result b/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result
--- a/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result	2007-06-27 14:28:29 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_stm_reset_slave.result	2007-10-13 22:41:02 +02:00
@@ -11,7 +11,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	106
+Read_Master_Log_Pos	107
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -26,7 +26,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	106
+Exec_Master_Log_Pos	107
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
@@ -52,7 +52,7 @@ Master_User	test
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	106
+Read_Master_Log_Pos	107
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -67,7 +67,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	106
+Exec_Master_Log_Pos	107
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
@@ -132,7 +132,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	106
+Read_Master_Log_Pos	107
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -147,7 +147,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	106
+Exec_Master_Log_Pos	107
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
diff -Nrup a/mysql-test/suite/rpl/r/rpl_stm_until.result b/mysql-test/suite/rpl/r/rpl_stm_until.result
--- a/mysql-test/suite/rpl/r/rpl_stm_until.result	2007-06-27 14:28:29 +02:00
+++ b/mysql-test/suite/rpl/r/rpl_stm_until.result	2007-10-13 22:41:02 +02:00
@@ -26,7 +26,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	784
+Read_Master_Log_Pos	785
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -41,7 +41,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	327
+Exec_Master_Log_Pos	328
 Relay_Log_Space	#
 Until_Condition	Master
 Until_Log_File	master-bin.000001
@@ -72,7 +72,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	784
+Read_Master_Log_Pos	785
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -87,7 +87,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	327
+Exec_Master_Log_Pos	328
 Relay_Log_Space	#
 Until_Condition	Master
 Until_Log_File	master-no-such-bin.000001
@@ -116,7 +116,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	784
+Read_Master_Log_Pos	785
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -131,7 +131,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	616
+Exec_Master_Log_Pos	617
 Relay_Log_Space	#
 Until_Condition	Relay
 Until_Log_File	slave-relay-bin.000004
@@ -158,7 +158,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000001
-Read_Master_Log_Pos	784
+Read_Master_Log_Pos	785
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000001
@@ -173,7 +173,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	784
+Exec_Master_Log_Pos	785
 Relay_Log_Space	#
 Until_Condition	Master
 Until_Log_File	master-bin.000001
diff -Nrup a/mysql-test/suite/rpl/t/rpl_heartbeat.test b/mysql-test/suite/rpl/t/rpl_heartbeat.test
--- /dev/null	Wed Dec 31 16:00:00 196900
+++ b/mysql-test/suite/rpl/t/rpl_heartbeat.test	2007-10-13 22:41:06 +02:00
@@ -0,0 +1,166 @@
+# Testing master to slave heartbeat protocol
+# 
+# Including:
+# - user interface, grammar, checking the range and warnings about 
+#   unreasonable values for the heartbeat period;
+# - no rotation of relay log if heartbeat is less that slave_net_timeout
+# - SHOW STATUS like 'Slave_received_heartbeats' action
+# - SHOW STATUS like 'Slave_heartbeat_period' report
+
+-- source include/have_log_bin.inc
+
+connect (master,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
+connect (slave,localhost,root,,test,$SLAVE_MYPORT,$SLAVE_MYSOCK);
+
+connection master;
+reset master;
+
+connection slave;
+set @@global.slave_net_timeout= 10;
+
+###
+### Checking the range
+###
+
+#
+# default period slave_net_timeout/2
+#
+--replace_result $MASTER_MYPORT MASTER_PORT
+eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT, master_user='root';
+--query_vertical show status like 'Slave_heartbeat_period';
+
+#
+# the max for the period is ULONG_MAX/1000; an attempt to exceed it is  denied
+#
+--replace_result $MASTER_MYPORT MASTER_PORT
+--error ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE
+eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT, master_user='root', master_heartbeat_period= 4294968;
+--query_vertical show status like 'Slave_heartbeat_period';
+
+#
+# the min value for the period is 1 millisecond an attempt to assign a
+# lesser will be warned with treating the value as zero
+#
+connection slave;
+--replace_result $MASTER_MYPORT MASTER_PORT
+--warning ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE
+eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT, master_user='root', master_heartbeat_period= 0.0009999;
+--query_vertical show status like 'Slave_heartbeat_period';
+
+#
+# the actual max and min must be accepted
+#
+--replace_result $MASTER_MYPORT MASTER_PORT
+eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT, master_user='root', master_heartbeat_period= 4294967;
+--query_vertical show status like 'Slave_heartbeat_period';
+
+--replace_result $MASTER_MYPORT MASTER_PORT
+eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT, master_user='root', master_heartbeat_period= 0.001;
+--query_vertical show status like 'Slave_heartbeat_period';
+
+reset slave;
+
+#
+# A warning if period greater than slave_net_timeout
+#
+set @@global.slave_net_timeout= 5;
+--replace_result $MASTER_MYPORT MASTER_PORT
+eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT, master_user='root', master_heartbeat_period= 5.001;
+--query_vertical show status like 'Slave_heartbeat_period';
+
+reset slave;
+
+#
+# A warning if slave_net_timeout is set to less than the current HB period
+#
+set @@global.slave_net_timeout= 5;
+--replace_result $MASTER_MYPORT MASTER_PORT
+eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT, master_user='root', master_heartbeat_period= 4;
+--query_vertical show status like 'Slave_heartbeat_period';
+set @@global.slave_net_timeout= 3 /* must be a warning */;
+
+reset slave;
+
+
+###
+### checking no rotation
+###
+
+connection master;
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+#
+# Even though master_heartbeat_period= 0.5 is 20 times less than
+# @@global.slave_net_timeout= 10 in some circumstances master will
+# not be able to send any heartbeat during the slave's net timeout
+# and slave's relay log will rotate.
+# The probability for such a scenario is pretty small so the following
+# part is almost deterministic.
+#
+
+connection slave;
+set @@global.slave_net_timeout= 10;
+--replace_result $MASTER_MYPORT MASTER_PORT
+# no error this time but rather a warning
+eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT, master_user='root', master_heartbeat_period= 0.5;
+--query_vertical show status like 'Slave_heartbeat_period';
+
+start slave;
+
+connection master;
+create table t1 (f1 int);
+
+#connection slave;
+sync_slave_with_master;
+source include/show_slave_status.inc;
+
+# there is an explicit sleep lasting longer than slave_net_timeout
+# to ensure that nothing will come to slave from master for that period.
+# That would cause reconnecting and relaylog rotation w/o the fix i.e
+# without a heartbeat received.
+
+real_sleep 15;
+
+# check (compare with the previous show's results) that no rotation happened
+source include/show_slave_status.inc;
+
+###
+### SHOW STATUS like 'Slave_heartbeat_period' and 'Slave_received_heartbeats'
+###
+
+--query_vertical show status like 'Slave_heartbeat_period';
+
+#
+# proof that there has been received at least one heartbeat;
+# The exact number of received heartbeat is an indeterministic value
+# and therefore it's not recorded into results.
+#
+
+let $slave_wait_param_counter= 300;
+let $slave_value= query_get_value("SHOW STATUS like 'Slave_received_heartbeats'", Value, 1);
+# Checking the fact that at least one heartbeat is received
+while (`select $slave_value = 0`)
+{
+  dec $slave_wait_param_counter;
+  if (!$slave_wait_param_counter)
+  {
+    --echo ERROR: failed while waiting for slave parameter $slave_param: $slave_param_value
+    query_vertical show slave status;
+    SHOW STATUS like 'Slave_received_heartbeats';
+    exit;
+  }
+  sleep 0.1;
+  let $slave_value= query_get_value("SHOW STATUS like 'Slave_received_heartbeats'", Value, 1);
+}
+--echo A heartbeat has been received by the slave
+# cleanup
+
+connection master;
+drop table t1;
+
+#connection slave;
+sync_slave_with_master;
+
+
+--echo End of tests
diff -Nrup a/mysql-test/suite/rpl/t/rpl_log_pos.test b/mysql-test/suite/rpl/t/rpl_log_pos.test
--- a/mysql-test/suite/rpl/t/rpl_log_pos.test	2007-06-27 14:28:29 +02:00
+++ b/mysql-test/suite/rpl/t/rpl_log_pos.test	2007-10-13 22:41:02 +02:00
@@ -17,7 +17,7 @@ sync_slave_with_master;
 stop slave;
 --source include/wait_for_slave_to_stop.inc
 
-change master to master_log_pos=75;
+change master to master_log_pos=76;
 source include/show_slave_status.inc;
 start slave;
 let $slave_param= Slave_SQL_Running;
@@ -39,7 +39,7 @@ create table t1 (n int);
 insert into t1 values (1),(2),(3);
 save_master_pos;
 connection slave;
-change master to master_log_pos=106;
+change master to master_log_pos=107;
 start slave;
 sync_with_master;
 select * from t1 ORDER BY n;
diff -Nrup a/mysql-test/suite/rpl/t/rpl_row_create_table.test b/mysql-test/suite/rpl/t/rpl_row_create_table.test
--- a/mysql-test/suite/rpl/t/rpl_row_create_table.test	2007-07-30 00:10:21 +02:00
+++ b/mysql-test/suite/rpl/t/rpl_row_create_table.test	2007-10-13 22:41:02 +02:00
@@ -36,7 +36,7 @@ CREATE TABLE t3 (a INT, b INT) CHARSET=u
 CREATE TABLE t4 (a INT, b INT) ENGINE=Merge CHARSET=utf8;
 --replace_column 1 # 4 #
 --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
---query_vertical SHOW BINLOG EVENTS FROM 216
+--query_vertical SHOW BINLOG EVENTS FROM 217
 --echo **** On Master ****
 --query_vertical SHOW CREATE TABLE t1
 --query_vertical SHOW CREATE TABLE t2
@@ -72,7 +72,7 @@ CREATE TABLE t7 (UNIQUE(b)) SELECT a,b F
 # Shouldn't be written to the binary log
 --replace_column 1 # 4 #
 --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
-SHOW BINLOG EVENTS FROM 1100;
+SHOW BINLOG EVENTS FROM 1101;
 
 # Test that INSERT-SELECT works the same way as for SBR.
 CREATE TABLE t7 (a INT, b INT UNIQUE);
@@ -82,7 +82,7 @@ SELECT * FROM t7 ORDER BY a,b;
 # Should be written to the binary log
 --replace_column 1 # 4 #
 --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
-SHOW BINLOG EVENTS FROM 1100;
+SHOW BINLOG EVENTS FROM 1101;
 sync_slave_with_master;
 SELECT * FROM t7 ORDER BY a,b;
 
@@ -94,7 +94,7 @@ INSERT INTO t7 SELECT a,b FROM tt4;
 ROLLBACK;
 --replace_column 1 # 4 #
 --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
-SHOW BINLOG EVENTS FROM 1298;
+SHOW BINLOG EVENTS FROM 1299;
 SELECT * FROM t7 ORDER BY a,b;
 sync_slave_with_master;
 SELECT * FROM t7 ORDER BY a,b;
@@ -110,7 +110,7 @@ CREATE TEMPORARY TABLE tt7 SELECT 1;
 --query_vertical SHOW CREATE TABLE t9
 --replace_column 1 # 4 #
 --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
-SHOW BINLOG EVENTS FROM 1396;
+SHOW BINLOG EVENTS FROM 1397;
 sync_slave_with_master;
 --echo **** On Slave ****
 --query_vertical SHOW CREATE TABLE t8
@@ -227,7 +227,7 @@ ROLLBACK;
 SELECT * FROM t2 ORDER BY a;
 --replace_column 1 # 4 #
 --replace_regex /\/\* xid=.* \*\//\/* XID *\// /Server ver: .*, Binlog ver: .*/Server ver: #, Binlog ver: #/ /table_id: [0-9]+/table_id: #/
-SHOW BINLOG EVENTS FROM 637;
+SHOW BINLOG EVENTS FROM 638;
 sync_slave_with_master;
 SELECT * FROM t2 ORDER BY a;
 
diff -Nrup a/mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test b/mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test
--- a/mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test	2007-07-30 00:10:21 +02:00
+++ b/mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test	2007-10-13 22:41:02 +02:00
@@ -1,7 +1,7 @@
 # depends on the binlog output
 -- source include/have_binlog_format_row.inc
 
-let $rename_event_pos= 623;
+let $rename_event_pos= 624;
 
 # Bug#18326: Do not lock table for writing during prepare of statement
 # The use of the ps protocol causes extra table maps in the binlog, so
diff -Nrup a/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test b/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test
--- a/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test	2007-06-27 14:27:31 +02:00
+++ b/mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test	2007-10-13 22:41:02 +02:00
@@ -169,7 +169,7 @@ connection master;
 select "--- Test 2 position test --" as "";
 --enable_query_log
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
---exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --position=416 $MYSQLTEST_VARDIR/log/master-bin.000001
+--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --position=417 $MYSQLTEST_VARDIR/log/master-bin.000001
 
 # These are tests for remote binlog.
 # They should return the same as previous test.
@@ -265,7 +265,7 @@ select "--- Test 6 reading stdin --" as 
 select "--- Test 7 reading stdin w/position --" as "";
 --enable_query_log
 --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
---exec $MYSQL_BINLOG --short-form --position=416 - < $MYSQLTEST_VARDIR/log/master-bin.000001
+--exec $MYSQL_BINLOG --short-form --position=417 - < $MYSQLTEST_VARDIR/log/master-bin.000001
 
 # Bug#16217 (mysql client did not know how not switch its internal charset)
 --disable_query_log
diff -Nrup a/mysql-test/suite/rpl/t/rpl_skip_error.test b/mysql-test/suite/rpl/t/rpl_skip_error.test
--- a/mysql-test/suite/rpl/t/rpl_skip_error.test	2007-06-27 14:28:29 +02:00
+++ b/mysql-test/suite/rpl/t/rpl_skip_error.test	2007-10-13 22:41:02 +02:00
@@ -44,7 +44,7 @@ select @@server_id;
 select * from t1;
 --replace_column 1 # 8 # 9 # 23 # 33 #
 --replace_result $MASTER_MYPORT MASTER_PORT
-show slave status;
+--query_vertical show slave status;
 connection master;
 drop table t1;
 sync_with_master;
diff -Nrup a/mysql-test/suite/rpl/t/rpl_sp.test b/mysql-test/suite/rpl/t/rpl_sp.test
--- a/mysql-test/suite/rpl/t/rpl_sp.test	2007-06-27 14:27:31 +02:00
+++ b/mysql-test/suite/rpl/t/rpl_sp.test	2007-10-13 22:41:02 +02:00
@@ -564,9 +564,7 @@ connection master;
 
 # Final inspection which verifies how all statements of this test file
 # were written to the binary log.
---replace_column 2 # 5 #
---replace_regex /table_id: [0-9]+/table_id: #/
-show binlog events in 'master-bin.000001' from 106;
+source include/show_binlog_events.inc;
 
 
 # Restore log_bin_trust_function_creators to its original value.
diff -Nrup a/mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test b/mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test
--- a/mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test	2007-06-27 14:27:28 +02:00
+++ b/mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test	2007-10-13 22:41:03 +02:00
@@ -1,7 +1,7 @@
 # depends on the binlog output
 --source include/have_binlog_format_mixed_or_statement.inc
 
-let $rename_event_pos= 656;
+let $rename_event_pos= 657;
 -- source extra/rpl_tests/rpl_flsh_tbls.test
 
 # End of 4.1 tests
diff -Nrup a/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result	2007-07-30 00:10:22 +02:00
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result	2007-10-13 22:41:03 +02:00
@@ -34,14 +34,14 @@ master-bin.000001	#	Table_map	1	#	table_
 master-bin.000001	#	Write_rows	1	#	table_id: #
 master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	1	#	COMMIT
-show binlog events from 106 limit 1;
+show binlog events from 107 limit 1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=NDB
-show binlog events from 106 limit 2;
+show binlog events from 107 limit 2;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	1	#	use `test`; create table t1(n int not null auto_increment primary key)ENGINE=NDB
 master-bin.000001	#	Query	1	#	BEGIN
-show binlog events from 106 limit 2,1;
+show binlog events from 107 limit 2,1;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Table_map	1	#	table_id: # (test.t1)
 flush logs;
@@ -228,13 +228,13 @@ master-bin.000002	#	Write_rows	1	#	table
 master-bin.000002	#	Query	1	#	COMMIT
 show binary logs;
 Log_name	File_size
-master-bin.000001	1760
-master-bin.000002	623
+master-bin.000001	1761
+master-bin.000002	624
 start slave;
 show binary logs;
 Log_name	File_size
-slave-bin.000001	1855
-slave-bin.000002	202
+slave-bin.000001	1856
+slave-bin.000002	203
 show binlog events in 'slave-bin.000001' from 4;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 slave-bin.000001	#	Format_desc	2	#	Server ver: VERSION, Binlog ver: 4
@@ -272,7 +272,7 @@ Master_User	root
 Master_Port	MASTER_PORT
 Connect_Retry	1
 Master_Log_File	master-bin.000002
-Read_Master_Log_Pos	623
+Read_Master_Log_Pos	624
 Relay_Log_File	#
 Relay_Log_Pos	#
 Relay_Master_Log_File	master-bin.000002
@@ -287,7 +287,7 @@ Replicate_Wild_Ignore_Table	
 Last_Errno	0
 Last_Error	
 Skip_Counter	0
-Exec_Master_Log_Pos	623
+Exec_Master_Log_Pos	624
 Relay_Log_Space	#
 Until_Condition	None
 Until_Log_File	
diff -Nrup a/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result	2007-06-27 14:27:26 +02:00
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result	2007-10-13 22:41:03 +02:00
@@ -26,11 +26,11 @@ stop slave;
 SELECT @the_pos:=Position,@the_file:=SUBSTRING_INDEX(FILE, '/', -1)
 FROM mysql.ndb_binlog_index WHERE epoch = <the_epoch> ;
 @the_pos:=Position	@the_file:=SUBSTRING_INDEX(FILE, '/', -1)
-106	master-bin1.000001
+107	master-bin1.000001
 CHANGE MASTER TO
 master_port=<MASTER_PORT1>,
 master_log_file = 'master-bin1.000001',
-master_log_pos = 106 ;
+master_log_pos = 107 ;
 start slave;
 INSERT INTO t1 VALUES ("row2","will go away",2),("row3","will change",3),("row4","D",4);
 DELETE FROM t1 WHERE c3 = 1;
diff -Nrup a/mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result b/mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result
--- a/mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result	2007-07-30 00:10:22 +02:00
+++ b/mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result	2007-10-13 22:41:03 +02:00
@@ -29,16 +29,16 @@ a	b
 DROP TABLE t1;
 SHOW BINLOG EVENTS;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	4	Format_desc	1	106	Server ver: SERVER_VERSION, Binlog ver: 4
-master-bin.000001	106	Query	1	223	use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB
-master-bin.000001	223	Query	1	287	BEGIN
-master-bin.000001	287	Table_map	1	330	table_id: # (test.t1)
-master-bin.000001	330	Table_map	1	392	table_id: # (mysql.ndb_apply_status)
-master-bin.000001	392	Write_rows	1	451	table_id: #
-master-bin.000001	451	Write_rows	1	498	table_id: # flags: STMT_END_F
-master-bin.000001	498	Query	1	563	COMMIT
-master-bin.000001	563	Query	1	643	use `test`; TRUNCATE TABLE t1
-master-bin.000001	643	Query	1	719	use `test`; DROP TABLE t1
+master-bin.000001	4	Format_desc	1	107	Server ver: SERVER_VERSION, Binlog ver: 4
+master-bin.000001	107	Query	1	224	use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB
+master-bin.000001	224	Query	1	288	BEGIN
+master-bin.000001	288	Table_map	1	331	table_id: # (test.t1)
+master-bin.000001	331	Table_map	1	393	table_id: # (mysql.ndb_apply_status)
+master-bin.000001	393	Write_rows	1	452	table_id: #
+master-bin.000001	452	Write_rows	1	499	table_id: # flags: STMT_END_F
+master-bin.000001	499	Query	1	564	COMMIT
+master-bin.000001	564	Query	1	644	use `test`; TRUNCATE TABLE t1
+master-bin.000001	644	Query	1	720	use `test`; DROP TABLE t1
 **** On Master ****
 CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB;
 INSERT INTO t1 VALUES (1,1), (2,2);
@@ -65,27 +65,27 @@ a	b
 DROP TABLE t1;
 SHOW BINLOG EVENTS;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	4	Format_desc	1	106	Server ver: SERVER_VERSION, Binlog ver: 4
-master-bin.000001	106	Query	1	223	use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB
-master-bin.000001	223	Query	1	287	BEGIN
-master-bin.000001	287	Table_map	1	330	table_id: # (test.t1)
-master-bin.000001	330	Table_map	1	392	table_id: # (mysql.ndb_apply_status)
-master-bin.000001	392	Write_rows	1	451	table_id: #
-master-bin.000001	451	Write_rows	1	498	table_id: # flags: STMT_END_F
-master-bin.000001	498	Query	1	563	COMMIT
-master-bin.000001	563	Query	1	643	use `test`; TRUNCATE TABLE t1
-master-bin.000001	643	Query	1	719	use `test`; DROP TABLE t1
-master-bin.000001	719	Query	1	836	use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB
-master-bin.000001	836	Query	1	900	BEGIN
-master-bin.000001	900	Table_map	1	943	table_id: # (test.t1)
-master-bin.000001	943	Table_map	1	1005	table_id: # (mysql.ndb_apply_status)
-master-bin.000001	1005	Write_rows	1	1064	table_id: #
-master-bin.000001	1064	Write_rows	1	1111	table_id: # flags: STMT_END_F
-master-bin.000001	1111	Query	1	1176	COMMIT
-master-bin.000001	1176	Query	1	1240	BEGIN
-master-bin.000001	1240	Table_map	1	1283	table_id: # (test.t1)
-master-bin.000001	1283	Table_map	1	1345	table_id: # (mysql.ndb_apply_status)
-master-bin.000001	1345	Write_rows	1	1404	table_id: #
-master-bin.000001	1404	Delete_rows	1	1443	table_id: # flags: STMT_END_F
-master-bin.000001	1443	Query	1	1508	COMMIT
-master-bin.000001	1508	Query	1	1584	use `test`; DROP TABLE t1
+master-bin.000001	4	Format_desc	1	107	Server ver: SERVER_VERSION, Binlog ver: 4
+master-bin.000001	107	Query	1	224	use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB
+master-bin.000001	224	Query	1	288	BEGIN
+master-bin.000001	288	Table_map	1	331	table_id: # (test.t1)
+master-bin.000001	331	Table_map	1	393	table_id: # (mysql.ndb_apply_status)
+master-bin.000001	393	Write_rows	1	452	table_id: #
+master-bin.000001	452	Write_rows	1	499	table_id: # flags: STMT_END_F
+master-bin.000001	499	Query	1	564	COMMIT
+master-bin.000001	564	Query	1	644	use `test`; TRUNCATE TABLE t1
+master-bin.000001	644	Query	1	720	use `test`; DROP TABLE t1
+master-bin.000001	720	Query	1	837	use `test`; CREATE TABLE t1 (a INT PRIMARY KEY, b LONG) ENGINE=NDB
+master-bin.000001	837	Query	1	901	BEGIN
+master-bin.000001	901	Table_map	1	944	table_id: # (test.t1)
+master-bin.000001	944	Table_map	1	1006	table_id: # (mysql.ndb_apply_status)
+master-bin.000001	1006	Write_rows	1	1065	table_id: #
+master-bin.000001	1065	Write_rows	1	1112	table_id: # flags: STMT_END_F
+master-bin.000001	1112	Query	1	1177	COMMIT
+master-bin.000001	1177	Query	1	1241	BEGIN
+master-bin.000001	1241	Table_map	1	1284	table_id: # (test.t1)
+master-bin.000001	1284	Table_map	1	1346	table_id: # (mysql.ndb_apply_status)
+master-bin.000001	1346	Write_rows	1	1405	table_id: #
+master-bin.000001	1405	Delete_rows	1	1444	table_id: # flags: STMT_END_F
+master-bin.000001	1444	Query	1	1509	COMMIT
+master-bin.000001	1509	Query	1	1585	use `test`; DROP TABLE t1
diff -Nrup a/mysql-test/t/ctype_cp932_binlog_stm.test b/mysql-test/t/ctype_cp932_binlog_stm.test
--- a/mysql-test/t/ctype_cp932_binlog_stm.test	2007-05-30 12:23:44 +02:00
+++ b/mysql-test/t/ctype_cp932_binlog_stm.test	2007-10-13 22:41:03 +02:00
@@ -22,16 +22,16 @@ CALL bug18293("Foo's a Bar", _cp932 0xED
 SELECT HEX(s1),HEX(s2),d FROM t4|
 DROP PROCEDURE bug18293|
 DROP TABLE t4|
-SHOW BINLOG EVENTS FROM 369|
+SHOW BINLOG EVENTS FROM 370|
 delimiter ;|
 
 --echo End of 5.0 tests
 
 #
 # #28436: Incorrect position in SHOW BINLOG EVENTS causes server coredump 
-# Note: 364 is a magic position (found experimentally, depends on 
+# Note: 365 (depends on FD event size changes) is a magic position (found experimentally, depends on  
 # the log's contents) that caused the server crash.
 --error 1220
-SHOW BINLOG EVENTS FROM 364;
+SHOW BINLOG EVENTS FROM 365;
 
 --echo End of 5.1 tests
diff -Nrup a/mysql-test/t/mysqlbinlog.test b/mysql-test/t/mysqlbinlog.test
--- a/mysql-test/t/mysqlbinlog.test	2007-08-01 12:31:16 +02:00
+++ b/mysql-test/t/mysqlbinlog.test	2007-10-13 22:41:03 +02:00
@@ -64,7 +64,7 @@ select "--- --database --" as "";
 select "--- --position --" as "";
 --enable_query_log
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
---exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --position=239 $MYSQLTEST_VARDIR/log/master-bin.000002
+--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --position=240 $MYSQLTEST_VARDIR/log/master-bin.000002
 
 # These are tests for remote binlog.
 # They should return the same as previous test.
@@ -96,7 +96,7 @@ select "--- --database --" as "";
 select "--- --position --" as "";
 --enable_query_log
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
---exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --position=239 --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002
+--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --position=240 --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
diff -Nrup a/mysql-test/t/mysqlbinlog2.test b/mysql-test/t/mysqlbinlog2.test
--- a/mysql-test/t/mysqlbinlog2.test	2007-06-15 18:56:02 +02:00
+++ b/mysql-test/t/mysqlbinlog2.test	2007-10-13 22:41:03 +02:00
@@ -50,15 +50,15 @@ select "--- offset --" as "";
 --disable_query_log
 select "--- start-position --" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form --start-position=608 $MYSQLTEST_VARDIR/log/master-bin.000001 
+--exec $MYSQL_BINLOG --short-form --start-position=609 $MYSQLTEST_VARDIR/log/master-bin.000001 
 --disable_query_log
 select "--- stop-position --" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form --stop-position=608 $MYSQLTEST_VARDIR/log/master-bin.000001 
+--exec $MYSQL_BINLOG --short-form --stop-position=609 $MYSQLTEST_VARDIR/log/master-bin.000001 
 --disable_query_log
 select "--- start and stop positions ---" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form --start-position=608 --stop-position 725 $MYSQLTEST_VARDIR/log/master-bin.000001 
+--exec $MYSQL_BINLOG --short-form --start-position=609 --stop-position 726 $MYSQLTEST_VARDIR/log/master-bin.000001 
 --disable_query_log
 select "--- start-datetime --" as "";
 --enable_query_log
@@ -84,11 +84,11 @@ select "--- offset --" as "";
 --disable_query_log
 select "--- start-position --" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form --start-position=608 $MYSQLTEST_VARDIR/log/master-bin.000001 $MYSQLTEST_VARDIR/log/master-bin.000002
+--exec $MYSQL_BINLOG --short-form --start-position=609 $MYSQLTEST_VARDIR/log/master-bin.000001 $MYSQLTEST_VARDIR/log/master-bin.000002
 --disable_query_log
 select "--- stop-position --" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form --stop-position=134 $MYSQLTEST_VARDIR/log/master-bin.000001 $MYSQLTEST_VARDIR/log/master-bin.000002
+--exec $MYSQL_BINLOG --short-form --stop-position=135 $MYSQLTEST_VARDIR/log/master-bin.000001 $MYSQLTEST_VARDIR/log/master-bin.000002
 --disable_query_log
 select "--- start-datetime --" as "";
 --enable_query_log
@@ -111,15 +111,15 @@ select "--- offset --" as "";
 --disable_query_log
 select "--- start-position --" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form --start-position=608 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 
+--exec $MYSQL_BINLOG --short-form --start-position=609 --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=608 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 
+--exec $MYSQL_BINLOG --short-form --stop-position=609 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001 
 --disable_query_log
 select "--- start and stop positions ---" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form --start-position=608 --stop-position 725 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001
+--exec $MYSQL_BINLOG --short-form --start-position=609 --stop-position 726 --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
@@ -142,11 +142,11 @@ select "--- offset --" as "";
 --disable_query_log
 select "--- start-position --" as "";
 --enable_query_log
---exec $MYSQL_BINLOG --short-form --start-position=608 --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=609 --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=134 --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=135 --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000001  master-bin.000002
 --disable_query_log
 select "--- start-datetime --" as "";
 --enable_query_log
diff -Nrup a/mysql-test/t/sp_trans_log.test b/mysql-test/t/sp_trans_log.test
--- a/mysql-test/t/sp_trans_log.test	2007-06-06 19:48:15 +02:00
+++ b/mysql-test/t/sp_trans_log.test	2007-10-13 22:41:03 +02:00
@@ -35,7 +35,8 @@ reset master|
 --error ER_DUP_ENTRY
 insert into t2 values (bug23333(),1)| 
 --replace_column 2 # 5 # 6 #
-show binlog events from 106 /* with fixes for #23333 will show there is the query */|
+# the following must show there is (are) events after the query */
+source include/show_binlog_events.inc|
 select count(*),@a from t1 /* must be 1,1 */|
 
 delimiter ;|
diff -Nrup a/sql/lex.h b/sql/lex.h
--- a/sql/lex.h	2007-04-02 10:54:27 +02:00
+++ b/sql/lex.h	2007-10-13 22:41:04 +02:00
@@ -314,6 +314,7 @@ static SYMBOL symbols[] = {
   { "MASTER_SSL_KEY",   SYM(MASTER_SSL_KEY_SYM)},
   { "MASTER_SSL_VERIFY_SERVER_CERT", SYM(MASTER_SSL_VERIFY_SERVER_CERT_SYM)},
   { "MASTER_USER",           SYM(MASTER_USER_SYM)},
+  { "MASTER_HEARTBEAT_PERIOD", SYM(MASTER_HEARTBEAT_PERIOD_SYM)},
   { "MATCH",		SYM(MATCH)},
   { "MAX_CONNECTIONS_PER_HOUR", SYM(MAX_CONNECTIONS_PER_HOUR)},
   { "MAX_QUERIES_PER_HOUR", SYM(MAX_QUERIES_PER_HOUR)},
diff -Nrup a/sql/log.cc b/sql/log.cc
--- a/sql/log.cc	2007-08-14 14:20:02 +02:00
+++ b/sql/log.cc	2007-10-13 22:41:04 +02:00
@@ -4033,36 +4033,60 @@ err:
 }
 
 
-/*
-  Wait until we get a signal that the binary log has been updated
+/**
+  Wait until we get a signal that the relay log has been updated
 
-  SYNOPSIS
-    wait_for_update()
-    thd			Thread variable
-    is_slave            If 0, the caller is the Binlog_dump thread from master;
-                        if 1, the caller is the SQL thread from the slave. This
-                        influences only thd->proc_info.
-
-  NOTES
-    One must have a lock on LOCK_log before calling this function.
-    This lock will be released before return! That's required by
-    THD::enter_cond() (see NOTES in sql_class.h).
+  @param[in] thd   a THD struct
+  @note
+    LOCK_log must be taken before calling this function.
+    It will be released at the end of the function.
 */
 
-void MYSQL_BIN_LOG::wait_for_update(THD* thd, bool is_slave)
+void MYSQL_BIN_LOG::wait_for_update_relay_log(THD* thd)
 {
   const char *old_msg;
   DBUG_ENTER("wait_for_update");
-
   old_msg= thd->enter_cond(&update_cond, &LOCK_log,
-                           is_slave ?
-                           "Has read all relay log; waiting for the slave I/O "
-                           "thread to update it" :
-                           "Has sent all binlog to slave; waiting for binlog "
-                           "to be updated");
+                           "Slave has read all relay log; " 
+                           "waiting for the slave I/O "
+                           "thread to update it" );
   pthread_cond_wait(&update_cond, &LOCK_log);
   thd->exit_cond(old_msg);
   DBUG_VOID_RETURN;
+}
+
+
+/**
+  Wait until we get a signal that the binary log has been updated.
+  Applies to master only.
+     
+  NOTES
+  @param[in] thd        a THD struct
+  @param[in] timeout    a pointer to a timespec;
+                        NULL means to wait w/o timeout.
+  @retval    0          if got signalled on update
+  @retval    non-0      if wait timeout elapsed
+  @note
+    LOCK_log must be taken before calling this function.
+    LOCK_log is being released while the thread is waiting.
+    LOCK_log is released by the caller.
+*/
+
+int MYSQL_BIN_LOG::wait_for_update_bin_log(THD* thd,
+                                           const struct timespec *timeout)
+{
+  int ret= 0;
+  const char* old_msg = thd->proc_info;
+  DBUG_ENTER("wait_for_update_bin_log");
+  old_msg= thd->enter_cond(&update_cond, &LOCK_log,
+                           "Master has sent all binlog to slave; "
+                           "waiting for binlog to be updated");
+  if (!timeout)
+    pthread_cond_wait(&update_cond, &LOCK_log);
+  else
+    ret= pthread_cond_timedwait(&update_cond, &LOCK_log,
+                                const_cast<struct timespec *>(timeout));
+  DBUG_RETURN(ret);
 }
 
 
diff -Nrup a/sql/log.h b/sql/log.h
--- a/sql/log.h	2007-08-02 06:50:52 +02:00
+++ b/sql/log.h	2007-10-13 22:41:04 +02:00
@@ -321,7 +321,8 @@ public:
   }
   void set_max_size(ulong max_size_arg);
   void signal_update();
-  void wait_for_update(THD* thd, bool master_or_slave);
+  void wait_for_update_relay_log(THD* thd);
+  int  wait_for_update_bin_log(THD* thd, const struct timespec * timeout);
   void set_need_start_event() { need_start_event = 1; }
   void init(bool no_auto_events_arg, ulong max_size);
   void init_pthread_objects();
diff -Nrup a/sql/log_event.cc b/sql/log_event.cc
--- a/sql/log_event.cc	2007-08-28 10:24:37 +02:00
+++ b/sql/log_event.cc	2007-10-13 22:41:04 +02:00
@@ -2511,6 +2511,7 @@ Format_description_log_event(uint8 binlo
       post_header_len[BEGIN_LOAD_QUERY_EVENT-1]= post_header_len[APPEND_BLOCK_EVENT-1];
       post_header_len[EXECUTE_LOAD_QUERY_EVENT-1]= EXECUTE_LOAD_QUERY_HEADER_LEN;
       post_header_len[INCIDENT_EVENT-1]= INCIDENT_HEADER_LEN;
+      post_header_len[HEARTBEAT_LOG_EVENT-1]= 0;
     }
     break;
 
@@ -8145,3 +8146,15 @@ Incident_log_event::write_data_body(IO_C
   DBUG_ENTER("Incident_log_event::write_data_body");
   DBUG_RETURN(write_str(file, m_message.str, m_message.length));
 }
+
+#if defined(HAVE_REPLICATION) && !defined(MYSQL_CLIENT)
+Heartbeat_log_event::Heartbeat_log_event(const char* buf, uint event_len,
+                    const Format_description_log_event* description_event)
+  :Log_event(buf, description_event)
+{
+  uint8 header_size= description_event->common_header_len;
+  ident_len = event_len - header_size;
+  set_if_smaller(ident_len,FN_REFLEN-1);
+  log_ident= buf + header_size;
+}
+#endif
diff -Nrup a/sql/log_event.h b/sql/log_event.h
--- a/sql/log_event.h	2007-08-28 10:14:42 +02:00
+++ b/sql/log_event.h	2007-10-13 22:41:04 +02:00
@@ -204,6 +204,7 @@ struct sql_ex_info
 #define EXECUTE_LOAD_QUERY_EXTRA_HEADER_LEN (4 + 4 + 4 + 1)
 #define EXECUTE_LOAD_QUERY_HEADER_LEN  (QUERY_HEADER_LEN + EXECUTE_LOAD_QUERY_EXTRA_HEADER_LEN)
 #define INCIDENT_HEADER_LEN    2
+#define HEARTBEAT_HEADER_LEN   0
 /* 
   Max number of possible extra bytes in a replication event compared to a
   packet (i.e. a query) sent from client to master;
@@ -497,6 +498,12 @@ enum Log_event_type
   INCIDENT_EVENT= 26,
 
   /*
+    Heartbeat event to be send by master at its idle time 
+    to ensure master's online status to slave 
+  */
+  HEARTBEAT_LOG_EVENT= 27,
+  
+  /*
     Add new events here - right above this comment!
     Existing events (except ENUM_END_EVENT) should never change their numbers
   */
@@ -604,6 +611,20 @@ typedef struct st_print_event_info
 } PRINT_EVENT_INFO;
 #endif
 
+/**
+  the struct aggregates two paramenters that identify an event
+  uniquely in scope of communication of a particular master and slave couple.
+  I.e there can not be 2 events from the same staying connected master which
+  have the same coordinates.
+  @note
+  Such identifier is not yet unique generally as the event originating master
+  is resetable. Also the crashed master can be replaced with some other.
+*/
+struct event_coordinates
+{
+  char * file_name; // binlog file name (directories stripped)
+  ulong  pos;       // event's position in the binlog file
+};
 
 /*****************************************************************************
 
@@ -2669,5 +2690,42 @@ static inline bool copy_event_cache_to_f
     my_b_copy_to_file(cache, file) ||
     reinit_io_cache(cache, WRITE_CACHE, 0, FALSE, TRUE);
 }
+
+#ifndef MYSQL_CLIENT
+/*****************************************************************************
+
+  Heartbeat Log Event class
+
+  Replication event to ensure to slave that master is alive.
+  The event is originated by master's dump thread and sent straight to
+  slave without being logged. Slave itself does not store it in relay log
+  but rather uses a data for immediate checks and throws away the event.
+
+  Two members of the class log_ident and Log_event::log_pos comprise 
+  @see the event_coordinates instance. The coordinates that a heartbeat
+  instance carries correspond to the last event master has sent from
+  its binlog.
+
+ ****************************************************************************/
+class Heartbeat_log_event: public Log_event
+{
+public:
+  Heartbeat_log_event(const char* buf, uint event_len,
+                      const Format_description_log_event* description_event);
+  Log_event_type get_type_code() { return HEARTBEAT_LOG_EVENT; }
+  bool is_valid() const
+    {
+      return (log_ident != NULL &&
+              log_pos >= BIN_LOG_HEADER_SIZE);
+    }
+  const char * get_log_ident() { return log_ident; }
+  uint get_ident_len() { return ident_len; }
+  
+private:
+  const char* log_ident;
+  uint ident_len;
+};
+#endif
+
 
 #endif /* _log_event_h */
diff -Nrup a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc	2007-08-27 22:31:26 +02:00
+++ b/sql/mysqld.cc	2007-10-13 22:41:04 +02:00
@@ -6440,6 +6440,40 @@ static int show_slave_retried_trans(THD 
   pthread_mutex_unlock(&LOCK_active_mi);
   return 0;
 }
+
+static int show_slave_received_heartbeats(THD *thd, SHOW_VAR *var, char *buff)
+{
+  pthread_mutex_lock(&LOCK_active_mi);
+  if (active_mi)
+  {
+    var->type= SHOW_LONGLONG;
+    var->value= buff;
+    pthread_mutex_lock(&active_mi->rli.data_lock);
+    *((longlong *)buff)= active_mi->received_heartbeats;
+    pthread_mutex_unlock(&active_mi->rli.data_lock);
+  }
+  else
+    var->type= SHOW_UNDEF;
+  pthread_mutex_unlock(&LOCK_active_mi);
+  return 0;
+}
+
+static int show_heartbeat_period(THD *thd, SHOW_VAR *var, char *buff)
+{
+  pthread_mutex_lock(&LOCK_active_mi);
+  if (active_mi)
+  {
+    var->type= SHOW_CHAR;
+    var->value= buff;
+    my_sprintf(buff, (buff, "%.3f",active_mi->heartbeat_period));
+  }
+  else
+    var->type= SHOW_UNDEF;
+  pthread_mutex_unlock(&LOCK_active_mi);
+  return 0;
+}
+
+
 #endif /* HAVE_REPLICATION */
 
 static int show_open_tables(THD *thd, SHOW_VAR *var, char *buff)
@@ -6910,6 +6944,8 @@ SHOW_VAR status_vars[]= {
   {"Slave_open_temp_tables",   (char*) &slave_open_temp_tables, SHOW_LONG},
 #ifdef HAVE_REPLICATION
   {"Slave_retried_transactions",(char*) &show_slave_retried_trans, SHOW_FUNC},
+  {"Slave_heartbeat_period",   (char*) &show_heartbeat_period, SHOW_FUNC},
+  {"Slave_received_heartbeats",(char*) &show_slave_received_heartbeats, SHOW_FUNC},
   {"Slave_running",            (char*) &show_slave_running,     SHOW_FUNC},
 #endif
   {"Slow_launch_threads",      (char*) &slow_launch_threads,    SHOW_LONG},
diff -Nrup a/sql/rpl_mi.cc b/sql/rpl_mi.cc
--- a/sql/rpl_mi.cc	2007-06-09 07:55:03 +02:00
+++ b/sql/rpl_mi.cc	2007-10-13 22:41:05 +02:00
@@ -26,12 +26,14 @@
 int init_intvar_from_file(int* var, IO_CACHE* f, int default_val);
 int init_strvar_from_file(char *var, int max_size, IO_CACHE *f,
 			  const char *default_val);
+int init_floatvar_from_file(float* var, IO_CACHE* f, float default_val);
 
 MASTER_INFO::MASTER_INFO()
   :Slave_reporting_capability("I/O"),
    ssl(0), fd(-1),  io_thd(0), inited(0),
    abort_slave(0),slave_running(0),
-   ssl_verify_server_cert(0), slave_run_id(0)
+   ssl_verify_server_cert(0), slave_run_id(0),
+   heartbeat_period(0), received_heartbeats(0)
 {
   host[0] = 0; user[0] = 0; password[0] = 0;
   ssl_ca[0]= 0; ssl_capath[0]= 0; ssl_cert[0]= 0;
@@ -70,6 +72,11 @@ void init_master_info_with_options(MASTE
     strmake(mi->password, master_password, MAX_PASSWORD_LENGTH);
   mi->port = master_port;
   mi->connect_retry = master_connect_retry;
+  /* 
+    always request heartbeat unless master_heartbeat_period is set explicitly zero.
+    Here is the default value for heartbeat period if CHANGE MASTER did not specify it:
+  */
+  mi->heartbeat_period= slave_net_timeout/2.0;
 
   mi->ssl= master_ssl;
   if (master_ssl_ca)
@@ -94,8 +101,11 @@ enum {
   /* 5.1.16 added value of master_ssl_verify_server_cert */
   LINE_FOR_MASTER_SSL_VERIFY_SERVER_CERT= 15,
 
+  /* 5.1.23 added value of master_heartbeat_period */
+  LINE_FOR_MASTER_HEARTBEAT_PERIOD= 16,
+
   /* Number of lines currently used when saving master info file */
-  LINES_IN_MASTER_INFO= LINE_FOR_MASTER_SSL_VERIFY_SERVER_CERT
+  LINES_IN_MASTER_INFO= LINE_FOR_MASTER_HEARTBEAT_PERIOD
 };
 
 int init_master_info(MASTER_INFO* mi, const char* master_info_fname,
@@ -197,6 +207,7 @@ file '%s')", fname);
     mi->fd = fd;
     int port, connect_retry, master_log_pos, lines;
     int ssl= 0, ssl_verify_server_cert= 0;
+    float master_heartbeat_period= 0.0;
     char *first_non_digit;
 
     /*
@@ -281,7 +292,13 @@ file '%s')", fname);
       if (lines >= LINE_FOR_MASTER_SSL_VERIFY_SERVER_CERT &&
           init_intvar_from_file(&ssl_verify_server_cert, &mi->file, 0))
         goto errwithmsg;
-
+      /*
+        Starting from 5.1.23 master_heartbeat_period might be
+        in the file
+      */
+      if (lines >= LINE_FOR_MASTER_HEARTBEAT_PERIOD &&
+          init_floatvar_from_file(&master_heartbeat_period, &mi->file, 0.0))
+        goto errwithmsg;
     }
 
 #ifndef HAVE_OPENSSL
@@ -300,6 +317,7 @@ file '%s')", fname);
     mi->connect_retry= (uint) connect_retry;
     mi->ssl= (my_bool) ssl;
     mi->ssl_verify_server_cert= ssl_verify_server_cert;
+    mi->heartbeat_period= master_heartbeat_period;
   }
   DBUG_PRINT("master_info",("log_file_name: %s  position: %ld",
                             mi->master_log_name,
@@ -378,16 +396,18 @@ int flush_master_info(MASTER_INFO* mi, b
      contents of file). But because of number of lines in the first line
      of file we don't care about this garbage.
   */
-
+  char heartbeat_buf[sizeof(mi->heartbeat_period) * 4]; // buffer to suffice always
+  my_sprintf(heartbeat_buf, (heartbeat_buf, "%.3f", mi->heartbeat_period));
   my_b_seek(file, 0L);
   my_b_printf(file,
-              "%u\n%s\n%s\n%s\n%s\n%s\n%d\n%d\n%d\n%s\n%s\n%s\n%s\n%s\n%d\n",
+              "%u\n%s\n%s\n%s\n%s\n%s\n%d\n%d\n%d\n%s\n%s\n%s\n%s\n%s\n%d\n%s\n",
               LINES_IN_MASTER_INFO,
               mi->master_log_name, llstr(mi->master_log_pos, lbuf),
               mi->host, mi->user,
               mi->password, mi->port, mi->connect_retry,
               (int)(mi->ssl), mi->ssl_ca, mi->ssl_capath, mi->ssl_cert,
-              mi->ssl_cipher, mi->ssl_key, mi->ssl_verify_server_cert);
+              mi->ssl_cipher, mi->ssl_key, mi->ssl_verify_server_cert,
+              heartbeat_buf);
   DBUG_RETURN(-flush_io_cache(file));
 }
 
diff -Nrup a/sql/rpl_mi.h b/sql/rpl_mi.h
--- a/sql/rpl_mi.h	2007-06-11 22:15:28 +02:00
+++ b/sql/rpl_mi.h	2007-10-13 22:41:05 +02:00
@@ -83,6 +83,8 @@ class MASTER_INFO : public Slave_reporti
   RELAY_LOG_INFO rli;
   uint port;
   uint connect_retry;
+  float heartbeat_period;         // interface with CHANGE MASTER or master.info
+  ulonglong received_heartbeats;  // counter of received heartbeat events
 #ifndef DBUG_OFF
   int events_till_disconnect;
 #endif
diff -Nrup a/sql/share/errmsg.txt b/sql/share/errmsg.txt
--- a/sql/share/errmsg.txt	2007-07-27 20:20:28 +02:00
+++ b/sql/share/errmsg.txt	2007-10-13 22:41:06 +02:00
@@ -6105,3 +6105,7 @@ ER_EVENT_INVALID_CREATION_CTX
 
 ER_TRG_CANT_OPEN_TABLE
   eng "Cannot open table for trigger `%-.64s`.`%-.64s`"
+ER_SLAVE_HEARTBEAT_FAILURE
+  eng "Unexpected master's heartbeat data: %s"
+ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE
+  eng "The requested value for the heartbeat period %s %s"
diff -Nrup a/sql/slave.cc b/sql/slave.cc
--- a/sql/slave.cc	2007-08-29 16:06:54 +02:00
+++ b/sql/slave.cc	2007-10-13 22:41:05 +02:00
@@ -722,6 +722,27 @@ int init_intvar_from_file(int* var, IO_C
   DBUG_RETURN(1);
 }
 
+int init_floatvar_from_file(float* var, IO_CACHE* f, float default_val)
+{
+  char buf[16];
+  DBUG_ENTER("init_floatvar_from_file");
+
+
+  if (my_b_gets(f, buf, sizeof(buf)))
+  {
+    if (sscanf(buf, "%f", var) != 1)
+      DBUG_RETURN(1);
+    else
+      DBUG_RETURN(0);
+  }
+  else if (default_val != 0.0)
+  {
+    *var = default_val;
+    DBUG_RETURN(0);
+  }
+  DBUG_RETURN(1);
+}
+
 /*
   Note that we rely on the master's version (3.23, 4.0.14 etc) instead of
   relying on the binlog's version. This is not perfect: imagine an upgrade
@@ -916,8 +937,27 @@ be equal for replication to work";
 different values for the TIME_ZONE global variable. The values must \
 be equal for replication to work";
     mysql_free_result(master_res);
+    goto err;
   }
 
+  if (mi->heartbeat_period != 0.0)
+  {
+    char llbuf[22];
+    const char query_format[]= "SET @master_heartbeat_period= %s";
+    char query[sizeof(query_format) - 2 + sizeof(llbuf)];
+    /* 
+       the period is an ulonglong of nano-secs. 
+    */
+    llstr((ulonglong) (mi->heartbeat_period*1000000000UL), llbuf);
+    my_sprintf(query, (query, query_format, llbuf));
+
+    if (mysql_real_query(mysql, query, strlen(query)))
+    {
+      errmsg= "The slave I/O thread stops because querying the master failed";
+      goto err;
+    }
+  }
+  
 err:
   if (errmsg)
   {
@@ -2269,12 +2309,8 @@ Stopping slave I/O thread due to out-of-
 
       retry_count=0;                    // ok event, reset retry counter
       thd->proc_info = "Queueing master event to the relay log";
-      if (queue_event(mi,(const char*)mysql->net.read_pos + 1,
-                      event_len))
+      if (queue_event(mi,(const char*)mysql->net.read_pos + 1, event_len))
       {
-        mi->report(ERROR_LEVEL, ER_SLAVE_RELAY_LOG_WRITE_FAILURE,
-                   ER(ER_SLAVE_RELAY_LOG_WRITE_FAILURE),
-                   "could not queue event from master");
         goto err;
       }
       if (flush_master_info(mi, 1))
@@ -3038,6 +3074,7 @@ static int queue_old_event(MASTER_INFO *
 int queue_event(MASTER_INFO* mi,const char* buf, ulong event_len)
 {
   int error= 0;
+  String error_msg;
   ulong inc_pos;
   RELAY_LOG_INFO *rli= &mi->rli;
   pthread_mutex_t *log_lock= rli->relay_log.get_log_lock();
@@ -3072,7 +3109,7 @@ int queue_event(MASTER_INFO* mi,const ch
     Rotate_log_event rev(buf,event_len,mi->rli.relay_log.description_event_for_queue);
     if (unlikely(process_io_rotate(mi,&rev)))
     {
-      error= 1;
+      error= ER_SLAVE_RELAY_LOG_WRITE_FAILURE;
       goto err;
     }
     /*
@@ -3099,7 +3136,7 @@ int queue_event(MASTER_INFO* mi,const ch
           Log_event::read_log_event(buf, event_len, &errmsg,
                                     mi->rli.relay_log.description_event_for_queue)))
     {
-      error= 2;
+      error= ER_SLAVE_RELAY_LOG_WRITE_FAILURE;
       goto err;
     }
     delete mi->rli.relay_log.description_event_for_queue;
@@ -3118,6 +3155,56 @@ int queue_event(MASTER_INFO* mi,const ch
 
   }
   break;
+
+  case HEARTBEAT_LOG_EVENT:
+  {
+    /*
+      HB (heartbeat) cannot come before RL (Relay)
+    */
+    char  llbuf[22];
+    Heartbeat_log_event hb(buf, event_len, mi->rli.relay_log.description_event_for_queue);
+    if (!hb.is_valid())
+    {
+      error= ER_SLAVE_HEARTBEAT_FAILURE;
+      error_msg.append(STRING_WITH_LEN("inconsistent heartbeat event content;"));
+      error_msg.append(STRING_WITH_LEN("the event's data: log_file_name "));
+      error_msg.append(hb.get_log_ident(), (uint) strlen(hb.get_log_ident()));
+      error_msg.append(STRING_WITH_LEN(" log_pos "));
+      llstr(hb.log_pos, llbuf);
+      error_msg.append(llbuf, strlen(llbuf));
+      goto err;
+    }
+    mi->received_heartbeats++;
+    /* 
+       compare local and event's versions of log_file, log_pos.
+       
+       Heartbeat is sent only after an event corresponding to the corrdinates
+       the heartbeat carries.
+       Slave can not have a difference in coordinates except in the only
+       special case when mi->master_log_name, master_log_pos have never
+       been updated by Rotate event i.e when slave does not have any history
+       with the master (and thereafter mi->master_log_pos is NULL).
+
+       TODO: handling `when' for SHOW SLAVE STATUS' snds behind
+    */
+    if ((memcmp(mi->master_log_name, hb.get_log_ident(), hb.get_ident_len())
+         && mi->master_log_name != NULL)
+        || mi->master_log_pos != hb.log_pos)
+    {
+      /* missed events of heartbeat from the past */
+      error= ER_SLAVE_HEARTBEAT_FAILURE;
+      error_msg.append(STRING_WITH_LEN("heartbeat is not compatible with local info;"));
+      error_msg.append(STRING_WITH_LEN("the event's data: log_file_name "));
+      error_msg.append(hb.get_log_ident(), (uint) strlen(hb.get_log_ident()));
+      error_msg.append(STRING_WITH_LEN(" log_pos "));
+      llstr(hb.log_pos, llbuf);
+      error_msg.append(llbuf, strlen(llbuf));
+      goto err;
+    }
+    goto skip_relay_logging;
+  }
+  break;
+    
   default:
     inc_pos= event_len;
     break;
@@ -3178,15 +3265,23 @@ int queue_event(MASTER_INFO* mi,const ch
       rli->relay_log.harvest_bytes_written(&rli->log_space_total);
     }
     else
-      error= 3;
+    {
+      error= ER_SLAVE_RELAY_LOG_WRITE_FAILURE;
+    }
     rli->ign_master_log_name_end[0]= 0; // last event is not ignored
   }
   pthread_mutex_unlock(log_lock);
 
-
+skip_relay_logging:
+  
 err:
   pthread_mutex_unlock(&mi->data_lock);
   DBUG_PRINT("info", ("error: %d", error));
+  if (error)
+    mi->report(ERROR_LEVEL, error, ER(error), 
+               (error == ER_SLAVE_RELAY_LOG_WRITE_FAILURE)?
+               "could not queue event from master" :
+               error_msg.ptr());
   DBUG_RETURN(error);
 }
 
@@ -3649,8 +3744,8 @@ static Log_event* next_event(RELAY_LOG_I
         */
         pthread_mutex_unlock(&rli->log_space_lock);
         pthread_cond_broadcast(&rli->log_space_cond);
-        // Note that wait_for_update unlocks lock_log !
-        rli->relay_log.wait_for_update(rli->sql_thd, 1);
+        // Note that wait_for_update_relay_log unlocks lock_log !
+        rli->relay_log.wait_for_update_relay_log(rli->sql_thd);
         // re-acquire data lock since we released it earlier
         pthread_mutex_lock(&rli->data_lock);
         rli->last_master_timestamp= save_timestamp;
diff -Nrup a/sql/slave.h b/sql/slave.h
--- a/sql/slave.h	2007-08-29 16:06:55 +02:00
+++ b/sql/slave.h	2007-10-13 22:41:05 +02:00
@@ -16,6 +16,16 @@
 #ifndef SLAVE_H
 #define SLAVE_H
 
+/* 
+   Some of defines are need in parser even though replication is not 
+   compiled in (embedded).
+*/
+
+/**
+   The maximum is defined as (ULONG_MAX/1000) with 4 bytes ulong
+*/
+#define SLAVE_MAX_HEARTBEAT_PERIOD 4294967
+
 #ifdef HAVE_REPLICATION
 
 #include "log.h"
@@ -26,7 +36,6 @@
 #define SLAVE_NET_TIMEOUT  3600
 
 #define MAX_SLAVE_ERROR    2000
-
 
 // Forward declarations
 struct st_relay_log_info;
diff -Nrup a/sql/sql_lex.h b/sql/sql_lex.h
--- a/sql/sql_lex.h	2007-08-23 23:21:07 +02:00
+++ b/sql/sql_lex.h	2007-10-13 22:41:05 +02:00
@@ -187,14 +187,15 @@ typedef struct st_lex_master_info
 {
   char *host, *user, *password, *log_file_name;
   uint port, connect_retry;
+  float heartbeat_period;
   ulonglong pos;
   ulong server_id;
   /*
     Enum is used for making it possible to detect if the user
     changed variable or if it should be left at old value
    */
-  enum {SSL_UNCHANGED, SSL_DISABLE, SSL_ENABLE}
-    ssl, ssl_verify_server_cert;
+  enum {LEX_MI_UNCHANGED, LEX_MI_DISABLE, LEX_MI_ENABLE}
+    ssl, ssl_verify_server_cert, heartbeat_opt;
   char *ssl_key, *ssl_cert, *ssl_ca, *ssl_capath, *ssl_cipher;
   char *relay_log_name;
   ulong relay_log_pos;
diff -Nrup a/sql/sql_repl.cc b/sql/sql_repl.cc
--- a/sql/sql_repl.cc	2007-07-07 09:04:08 +02:00
+++ b/sql/sql_repl.cc	2007-10-13 22:41:05 +02:00
@@ -314,6 +314,74 @@ Increase max_allowed_packet on master";
 }
 
 
+/**
+  An auxiliary function for calling in mysql_binlog_send
+  to initialize the heartbeat timeout in waiting for a binlogged event.
+
+  @param[in]    thd  THD to access a user variable
+
+  @return        heartbeat period an ulonglong of nanoseconds
+                 or zero if heartbeat was not demanded by slave
+*/ 
+static ulonglong get_heartbeat_period(THD * thd)
+{
+  my_bool null_value;
+  LEX_STRING name=  { C_STRING_WITH_LEN("master_heartbeat_period")};
+  user_var_entry *entry= 
+    (user_var_entry*) hash_search(&thd->user_vars, (uchar*) name.str,
+                                  name.length);
+  return entry? entry->val_int(&null_value) : 0;
+}
+
+/*
+  Function prepares and sends repliation heartbeat event.
+
+  @param net                net object of THD
+  @param packet             buffer to store the heartbeat instance
+  @param event_coordinates  binlog file name and position of the last
+                            real event master sent from binlog
+
+  @note 
+    Among three essential pieces of heartbeat data Log_event::when
+    is computed locally.
+    The  error to send is serious and should force terminating
+    the dump thread.
+*/
+static int send_heartbeat_event(NET* net, String* packet,
+                                const struct event_coordinates *coord)
+{
+  DBUG_ENTER("send_heartbeat_event");
+  char header[LOG_EVENT_HEADER_LEN];
+  /*
+    'when' (the timestamp) is set to 0 so that slave could distinguish between
+    real and fake Rotate events (if necessary)
+  */
+  memset(header, 0, 4);  // when
+
+  header[EVENT_TYPE_OFFSET] = HEARTBEAT_LOG_EVENT;
+
+  char* p= coord->file_name + dirname_length(coord->file_name);
+
+  uint ident_len = strlen(p);
+  ulong event_len = ident_len + LOG_EVENT_HEADER_LEN;
+  int4store(header + SERVER_ID_OFFSET, server_id);
+  int4store(header + EVENT_LEN_OFFSET, event_len);
+  int2store(header + FLAGS_OFFSET, 0);
+
+  int4store(header + LOG_POS_OFFSET, coord->pos);  // log_pos
+
+  packet->append(header, sizeof(header));
+  packet->append(p, ident_len);             // log_file_name
+
+  if (my_net_write(net, (uchar*) packet->ptr(), packet->length()))
+  {
+    DBUG_RETURN(-1);
+  }
+  net_flush(net);
+  packet->set("\0", 1, &my_charset_bin);
+  DBUG_RETURN(0);
+}
+
 /*
   TODO: Clean up loop to only have one call to send_file()
 */
@@ -339,7 +407,23 @@ void mysql_binlog_send(THD* thd, char* l
   DBUG_PRINT("enter",("log_ident: '%s'  pos: %ld", log_ident, (long) pos));
 
   bzero((char*) &log,sizeof(log));
-
+  /* 
+     heartbeat_period from @master_heartbeat_period user variable
+  */
+  ulonglong heartbeat_period= get_heartbeat_period(thd);
+  struct timespec heartbeat_buf;
+  struct event_coordinates coord_buf;
+  struct timespec *heartbeat_ts= NULL;
+  struct event_coordinates *coord= NULL;
+  if (heartbeat_period != LL(0))
+  {
+    heartbeat_ts= &heartbeat_buf;
+    heartbeat_ts->tv_sec= 0;
+    heartbeat_ts->tv_nsec= 0;
+    coord= &coord_buf;
+    coord->file_name= log_file_name; // initialization basing on what slave remembers
+    coord->pos= pos;
+  }
 #ifndef DBUG_OFF
   if (opt_sporadic_binlog_dump_fail && (binlog_dump_count++ % 2))
   {
@@ -530,6 +614,11 @@ impossible position";
 	goto err;
       }
 #endif
+      /*
+        log's filename does not change while it's active
+      */
+      if (coord)
+        coord->pos= uint4korr(packet->ptr() + 1 + LOG_POS_OFFSET);
 
       if ((*packet)[EVENT_TYPE_OFFSET+1] == FORMAT_DESCRIPTION_EVENT)
       {
@@ -625,26 +714,61 @@ impossible position";
 	  /* we read successfully, so we'll need to send it to the slave */
 	  pthread_mutex_unlock(log_lock);
 	  read_packet = 1;
+          if (coord)
+            coord->pos= uint4korr(packet->ptr() + 1 + LOG_POS_OFFSET);
 	  break;
 
 	case LOG_READ_EOF:
+        {
+          int ret;
 	  DBUG_PRINT("wait",("waiting for data in binary log"));
 	  if (thd->server_id==0) // for mysqlbinlog (mysqlbinlog.server_id==0)
 	  {
 	    pthread_mutex_unlock(log_lock);
 	    goto end;
 	  }
-	  if (!thd->killed)
-	  {
-	    /* Note that the following call unlocks lock_log */
-	    mysql_bin_log.wait_for_update(thd, 0);
-	  }
-	  else
-	    pthread_mutex_unlock(log_lock);
-	  DBUG_PRINT("wait",("binary log received update"));
-	  break;
 
-	default:
+#ifndef DBUG_OFF
+          ulong hb_info_counter= 0;
+#endif
+          do 
+          {
+            if (coord)
+            {
+              DBUG_ASSERT(heartbeat_ts && heartbeat_period != LL(0));
+              set_timespec_nsec(*heartbeat_ts, heartbeat_period);
+            }
+            ret= mysql_bin_log.wait_for_update_bin_log(thd, heartbeat_ts);
+            DBUG_ASSERT(ret == 0 || heartbeat_period != LL(0) && coord != NULL);
+            if (ret == ETIMEDOUT || ret == ETIME)
+            {
+#ifndef DBUG_OFF
+              if (hb_info_counter < 3)
+              {
+                sql_print_information("master sends heartbeat message");
+                hb_info_counter++;
+                if (hb_info_counter == 3)
+                  sql_print_information("the rest of heartbeat info skipped ...");
+              }
+#endif
+              if (send_heartbeat_event(net, packet, coord))
+              {
+                errmsg = "Failed on my_net_write()";
+                my_errno= ER_UNKNOWN_ERROR;
+                goto err;
+              }
+            }
+            else
+            {
+              DBUG_ASSERT(ret == 0);
+              DBUG_PRINT("wait",("binary log received update"));
+            }
+          } while (ret != 0 && coord != NULL && !thd->killed);
+          pthread_mutex_unlock(log_lock);
+        }    
+        break;
+            
+        default:
 	  pthread_mutex_unlock(log_lock);
 	  fatal_error = 1;
 	  break;
@@ -728,6 +852,8 @@ impossible position";
 
       packet->length(0);
       packet->append('\0');
+      if (coord)
+        coord->file_name= log_file_name; // reset to the next
     }
   }
 
@@ -1130,13 +1256,15 @@ bool change_master(THD* thd, MASTER_INFO
     mi->port = lex_mi->port;
   if (lex_mi->connect_retry)
     mi->connect_retry = lex_mi->connect_retry;
+  if (lex_mi->heartbeat_opt != LEX_MASTER_INFO::LEX_MI_UNCHANGED)
+    mi->heartbeat_period = lex_mi->heartbeat_period;
+  mi->received_heartbeats= LL(0); // counter lives until master is CHANGEd
+  if (lex_mi->ssl != LEX_MASTER_INFO::LEX_MI_UNCHANGED)
+    mi->ssl= (lex_mi->ssl == LEX_MASTER_INFO::LEX_MI_ENABLE);
 
-  if (lex_mi->ssl != LEX_MASTER_INFO::SSL_UNCHANGED)
-    mi->ssl= (lex_mi->ssl == LEX_MASTER_INFO::SSL_ENABLE);
-
-  if (lex_mi->ssl_verify_server_cert != LEX_MASTER_INFO::SSL_UNCHANGED)
+  if (lex_mi->ssl_verify_server_cert != LEX_MASTER_INFO::LEX_MI_UNCHANGED)
     mi->ssl_verify_server_cert=
-      (lex_mi->ssl_verify_server_cert == LEX_MASTER_INFO::SSL_ENABLE);
+      (lex_mi->ssl_verify_server_cert == LEX_MASTER_INFO::LEX_MI_ENABLE);
 
   if (lex_mi->ssl_ca)
     strmake(mi->ssl_ca, lex_mi->ssl_ca, sizeof(mi->ssl_ca)-1);
@@ -1635,12 +1763,33 @@ public:
   bool update(THD *thd, set_var *var);
 };
 
+static void fix_slave_net_timeout(THD *thd, enum_var_type type)
+{
+  DBUG_ENTER("fix_slave_net_timeout");
+#ifdef HAVE_REPLICATION
+  pthread_mutex_lock(&LOCK_active_mi);
+  DBUG_PRINT("info",("slave_net_timeout=%lu mi->heartbeat_period=%.3f",
+                     slave_net_timeout,
+                     (active_mi? active_mi->heartbeat_period : 0.0)));
+  if (active_mi && slave_net_timeout < active_mi->heartbeat_period)
+    push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
+                        ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE,
+                        "The currect value for master_heartbeat_period"
+                        " exceeds the new value of `slave_net_timeout' sec."
+                        " A sensible value for the period should be"
+                        " less than the timeout.");
+  pthread_mutex_unlock(&LOCK_active_mi);
+#endif
+  DBUG_VOID_RETURN;
+}
+
 static sys_var_chain vars = { NULL, NULL };
 
 static sys_var_bool_ptr	sys_relay_log_purge(&vars, "relay_log_purge",
 					    &relay_log_purge);
 static sys_var_long_ptr	sys_slave_net_timeout(&vars, "slave_net_timeout",
-					      &slave_net_timeout);
+					      &slave_net_timeout,
+                                              fix_slave_net_timeout);
 static sys_var_long_ptr	sys_slave_trans_retries(&vars, "slave_transaction_retries",
 						&slave_trans_retries);
 static sys_var_sync_binlog_period sys_sync_binlog_period(&vars, "sync_binlog", &sync_binlog_period);
diff -Nrup a/sql/sql_yacc.yy b/sql/sql_yacc.yy
--- a/sql/sql_yacc.yy	2007-08-13 21:39:25 +02:00
+++ b/sql/sql_yacc.yy	2007-10-13 22:41:06 +02:00
@@ -784,6 +784,7 @@ bool my_yyoverflow(short **a, YYSTYPE **
 %token  MASTER_SSL_VERIFY_SERVER_CERT_SYM
 %token  MASTER_SYM
 %token  MASTER_USER_SYM
+%token  MASTER_HEARTBEAT_PERIOD_SYM
 %token  MATCH                         /* SQL-2003-R */
 %token  MAX_CONNECTIONS_PER_HOUR
 %token  MAX_QUERIES_PER_HOUR
@@ -1496,7 +1497,7 @@ master_def:
        | MASTER_SSL_SYM EQ ulong_num
          {
            Lex->mi.ssl= $3 ? 
-               LEX_MASTER_INFO::SSL_ENABLE : LEX_MASTER_INFO::SSL_DISABLE;
+             LEX_MASTER_INFO::LEX_MI_ENABLE : LEX_MASTER_INFO::LEX_MI_DISABLE;
          }
        | MASTER_SSL_CA_SYM EQ TEXT_STRING_sys
          {
@@ -1516,12 +1517,51 @@ master_def:
          }
        | MASTER_SSL_KEY_SYM EQ TEXT_STRING_sys
          {
-           Lex->mi.ssl_key= $3.str;
-	 }
+            Lex->mi.ssl_key= $3.str;
+         }
        | MASTER_SSL_VERIFY_SERVER_CERT_SYM EQ ulong_num
          {
            Lex->mi.ssl_verify_server_cert= $3 ?
-               LEX_MASTER_INFO::SSL_ENABLE : LEX_MASTER_INFO::SSL_DISABLE;
+               LEX_MASTER_INFO::LEX_MI_ENABLE : LEX_MASTER_INFO::LEX_MI_DISABLE;
+         }
+       | MASTER_HEARTBEAT_PERIOD_SYM EQ NUM_literal
+         {
+           Lex->mi.heartbeat_period= $3->val_real();
+           if (Lex->mi.heartbeat_period > SLAVE_MAX_HEARTBEAT_PERIOD ||
+               Lex->mi.heartbeat_period < 0.0)
+           {
+             char buf[sizeof(SLAVE_MAX_HEARTBEAT_PERIOD*4)];
+             my_sprintf(buf, (buf, "%d seconds", SLAVE_MAX_HEARTBEAT_PERIOD));
+             my_error(ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE,
+                      MYF(0),
+                      " is negative or exceeds the maximum ",
+                      buf); 
+             MYSQL_YYABORT;
+           }
+           if (Lex->mi.heartbeat_period > slave_net_timeout)
+           {
+             push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN,
+                                 ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE,
+                                 ER(ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE),
+                                 " exceeds the value of `slave_net_timeout' sec.",
+                                 " A sensible value for the period should be"
+                                 " less than the timeout.");
+           }
+           if (Lex->mi.heartbeat_period < 0.001)
+           {
+             if (Lex->mi.heartbeat_period != 0.0)
+             {
+               push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN,
+                                   ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE,
+                                   ER(ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE),
+                                   " is less than 1 msec.",
+                                   " The period is reset to zero which means"
+                                   " no heartbeats will be sending");
+               Lex->mi.heartbeat_period= 0.0;
+             }
+             Lex->mi.heartbeat_opt=  LEX_MASTER_INFO::LEX_MI_DISABLE;
+           }
+           Lex->mi.heartbeat_opt=  LEX_MASTER_INFO::LEX_MI_ENABLE;
          }
        |
          master_file_def
Thread
bk commit into 5.1 tree (aelkin:1.2605) BUG#20435Andrei Elkin13 Oct