~percona-dev/percona-server/release-5.1.52-12-rnt

# name       : wl47.patch

# introduced : 12

# maintainer : Oleg

#

#!!! notice !!!

# Any small change to this file in the main branch

# should be done or reviewed by the maintainer!

diff -ruN a/client/client_priv.h b/client/client_priv.h

--- a/client/client_priv.h	2010-08-18 18:36:12.628622360 +0400

+++ b/client/client_priv.h	2010-08-18 18:35:54.549872942 +0400

@@ -93,6 +93,7 @@

   OPT_SYSLOG,

   OPT_FIRST_SLAVE,

   OPT_REWRITE_DB,

+  OPT_SKIP_ANNOTATE_ROWS_EVENTS,

   OPT_ALL,

   OPT_MAX_CLIENT_OPTION

 };

diff -ruN a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc

--- a/client/mysqlbinlog.cc	2010-08-18 18:36:12.598623007 +0400

+++ b/client/mysqlbinlog.cc	2010-08-18 18:35:54.549872942 +0400

@@ -107,6 +107,7 @@

 static short binlog_flags = 0; 

 static MYSQL* mysql = NULL;

 static const char* dirname_for_local_load= 0;

+static bool opt_skip_annotate_rows_events= 0;

 /**

   Pointer to the Format_description_log_event of the currently active binlog.

@@ -128,6 +129,70 @@

   OK_STOP

 };

+/**

+  Pointer to the last read Annotate_rows_log_event. Having read an

+  Annotate_rows event, we should not print it immediatedly because all

+  subsequent rbr events can be filtered away, and have to keep it for a while.

+  Also because of that when reading a remote Annotate event we have to keep

+  its binary log representation in a separately allocated buffer.

+*/

+static Annotate_rows_log_event *annotate_event= NULL;

+

+void free_annotate_event()

+{

+  if (annotate_event)

+  {

+    delete annotate_event;

+    annotate_event= 0;

+  }

+}

+

+Log_event* read_remote_annotate_event(uchar* net_buf, ulong event_len,

+                                      const char **error_msg)

+{

+  uchar *event_buf;

+  Log_event* event;

+

+  if (!(event_buf= (uchar*) my_malloc(event_len + 1, MYF(MY_WME))))

+  {

+    error("Out of memory");

+    return 0;

+  }

+

+  memcpy(event_buf, net_buf, event_len);

+  event_buf[event_len]= 0;

+

+  if (!(event= Log_event::read_log_event((const char*) event_buf, event_len,

+                                         error_msg, glob_description_event)))

+  {

+    my_free(event_buf, MYF(0));

+    return 0;

+  }

+  /*

+    Ensure the event->temp_buf is pointing to the allocated buffer.

+    (TRUE = free temp_buf on the event deletion)

+  */

+  event->register_temp_buf((char*)event_buf, TRUE);

+

+  return event;

+}

+

+void keep_annotate_event(Annotate_rows_log_event* event)

+{

+  free_annotate_event();

+  annotate_event= event;

+}

+

+void print_annotate_event(PRINT_EVENT_INFO *print_event_info)

+{

+  if (annotate_event)

+  {

+    annotate_event->print(result_file, print_event_info);

+    delete annotate_event;  // the event should not be printed more than once

+    annotate_event= 0;

+  }

+}

+

 static Exit_status dump_local_log_entries(PRINT_EVENT_INFO *print_event_info,

                                           const char* logname);

 static Exit_status dump_remote_log_entries(PRINT_EVENT_INFO *print_event_info,

@@ -936,6 +1001,19 @@

 	my_free(fname, MYF(MY_WME));

       break;

     }

+    case ANNOTATE_ROWS_EVENT:

+      if (!opt_skip_annotate_rows_events)

+      {

+        /*

+          We don't print Annotate event just now because all subsequent

+          rbr-events can be filtered away. Instead we'll keep the event

+          till it will be printed together with the first not filtered

+          away Table map or the last rbr will be processed.

+        */

+        keep_annotate_event((Annotate_rows_log_event*) ev);

+        destroy_evt= FALSE;

+      }

+      break;

     case TABLE_MAP_EVENT:

     {

       Table_map_log_event *map= ((Table_map_log_event *)ev);

@@ -945,6 +1023,13 @@

         destroy_evt= FALSE;

         goto end;

       }

+      /*

+        The Table map is to be printed, so it's just the time when we may

+        print the kept Annotate event (if there is any).

+        print_annotate_event() also deletes the kept Annotate event.

+      */

+      print_annotate_event(print_event_info);

+

       size_t len_to= 0;

       const char* db_to= binlog_filter->get_rewrite_db(map->get_db_name(), &len_to);

       if (len_to && map->rewrite_db(db_to, len_to, glob_description_event))

@@ -981,6 +1066,13 @@

           if (print_event_info->m_table_map_ignored.count() > 0)

             print_event_info->m_table_map_ignored.clear_tables();

+          /*

+            If there is a kept Annotate event and all corresponding

+            rbr-events were filtered away, the Annotate event was not

+            freed and it is just the time to do it.

+          */

+          free_annotate_event();

+

           /* 

              One needs to take into account an event that gets

              filtered but was last event in the statement. If this is

@@ -1215,6 +1307,11 @@

    "Updates to a database with a different name than the original. \

 Example: rewrite-db='from->to'.",

    0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

+  {"skip-annotate-rows-events", OPT_SKIP_ANNOTATE_ROWS_EVENTS,

+   "Don't print Annotate_rows events stored in the binary log.",

+   (uchar**) &opt_skip_annotate_rows_events,

+   (uchar**) &opt_skip_annotate_rows_events,

+   0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

   {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}

 };

@@ -1686,6 +1783,8 @@

     cast to uint32.

   */

   int4store(buf, (uint32)start_position);

+  if (!opt_skip_annotate_rows_events)

+    binlog_flags|= BINLOG_SEND_ANNOTATE_ROWS_EVENT;

   int2store(buf + BIN_LOG_HEADER_SIZE, binlog_flags);

   size_t tlen = strlen(logname);

@@ -1718,18 +1817,30 @@

       break; // end of data

     DBUG_PRINT("info",( "len: %lu  net->read_pos[5]: %d\n",

 			len, net->read_pos[5]));

-    if (!(ev= Log_event::read_log_event((const char*) net->read_pos + 1 ,

-                                        len - 1, &error_msg,

-                                        glob_description_event)))

+    if (net->read_pos[5] == ANNOTATE_ROWS_EVENT)

     {

-      error("Could not construct log event object: %s", error_msg);

-      DBUG_RETURN(ERROR_STOP);

-    }   

-    /*

-      If reading from a remote host, ensure the temp_buf for the

-      Log_event class is pointing to the incoming stream.

-    */

-    ev->register_temp_buf((char *) net->read_pos + 1, FALSE);

+      if (!(ev= read_remote_annotate_event(net->read_pos + 1, len - 1,

+                                           &error_msg)))

+      {

+        error("Could not construct annotate event object: %s", error_msg);

+        DBUG_RETURN(ERROR_STOP);

+      }   

+    }

+    else

+    {

+      if (!(ev= Log_event::read_log_event((const char*) net->read_pos + 1 ,

+                                          len - 1, &error_msg,

+                                          glob_description_event)))

+      {

+        error("Could not construct log event object: %s", error_msg);

+        DBUG_RETURN(ERROR_STOP);

+      }   

+      /*

+        If reading from a remote host, ensure the temp_buf for the

+        Log_event class is pointing to the incoming stream.

+      */

+      ev->register_temp_buf((char *) net->read_pos + 1, FALSE);

+    }

     Log_event_type type= ev->get_type_code();

     if (glob_description_event->binlog_version >= 3 ||

@@ -2238,6 +2349,7 @@

   if (result_file != stdout)

     my_fclose(result_file, MYF(0));

   cleanup();

+  free_annotate_event();

   delete binlog_filter;

   free_root(&s_mem_root, MYF(0));

   free_defaults(defaults_argv);

diff -ruN a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test

--- a/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test	2010-07-09 17:03:35.000000000 +0400

+++ b/mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test	2010-08-18 18:35:54.549872942 +0400

@@ -321,14 +321,19 @@

 # we check that the error code of the "ROLLBACK" event is 0 and not

 # ER_SERVER_SHUTDOWN (i.e. disconnection just rolls back transaction

 # and does not make slave to stop)

+

+-- source include/binlog_start_pos.inc

+

 if (`select @@binlog_format = 'ROW'`)

 {

-  --exec $MYSQL_BINLOG --start-position=524 $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output

+  let $start_pos= `select @binlog_start_pos + 418`;

+  --exec $MYSQL_BINLOG --start-position=$start_pos $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output

 }

 if (`select @@binlog_format = 'STATEMENT' || @@binlog_format = 'MIXED'`)

 {

-  --exec $MYSQL_BINLOG --start-position=555 $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output

+  let $start_pos= `select @binlog_start_pos + 449`;

+  --exec $MYSQL_BINLOG --start-position=$start_pos $MYSQLD_DATADIR/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output

 }

 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

diff -ruN 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	2010-07-09 17:03:36.000000000 +0400

+++ b/mysql-test/extra/rpl_tests/rpl_deadlock.test	2010-08-18 18:35:54.549872942 +0400

@@ -72,7 +72,7 @@

 --source include/stop_slave.inc

 DELETE FROM t2;

 # Set slave position to the BEGIN log event

---replace_result $master_pos_begin MASTER_POS_BEGIN

+--replace_result $master_pos_begin <master_pos_begin>

 eval CHANGE MASTER TO MASTER_LOG_POS=$master_pos_begin; 

 BEGIN;

 # Hold lock

@@ -103,7 +103,7 @@

 --source include/stop_slave.inc

 DELETE FROM t2;

 # Set slave position to the BEGIN log event

---replace_result $master_pos_begin MASTER_POS_BEGIN

+--replace_result $master_pos_begin <master_pos_begin>

 eval CHANGE MASTER TO MASTER_LOG_POS=$master_pos_begin; 

 BEGIN;

 # Hold lock

diff -ruN 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	2010-07-09 17:03:37.000000000 +0400

+++ b/mysql-test/extra/rpl_tests/rpl_log.test	2010-08-18 18:35:54.549872942 +0400

@@ -14,6 +14,7 @@

 reset master;

 reset slave;

 source include/start_slave.inc;

+source include/binlog_start_pos.inc;

 let $VERSION=`select version()`;

diff -ruN a/mysql-test/extra/rpl_tests/rpl_row_annotate.test b/mysql-test/extra/rpl_tests/rpl_row_annotate.test

--- a/mysql-test/extra/rpl_tests/rpl_row_annotate.test	1970-01-01 03:00:00.000000000 +0300

+++ b/mysql-test/extra/rpl_tests/rpl_row_annotate.test	2010-08-18 18:35:54.559911931 +0400

@@ -0,0 +1,155 @@

+########################################################################

+# WL47: Store in binlog text of statements that caused RBR events

+# new event          : ANNOTATE_ROWS_EVENT

+# new master option  : --binlog-annotate-rows-events

+# new slave option   : --replicate-annotate-rows-events

+########################################################################

+--source include/master-slave.inc

+connect (master2,127.0.0.1,root,,test,$MASTER_MYPORT,);

+

+connection master;

+--disable_query_log

+

+--disable_warnings

+DROP DATABASE IF EXISTS test1;

+--enable_warnings

+

+CREATE DATABASE test1;

+USE test1;

+

+CREATE TABLE t1(a int primary key, b int);

+CREATE TABLE t2(a int, b int);

+CREATE TABLE t3(a int, b int);

+CREATE TABLE t4(a int, b int);

+CREATE TABLE xt1(a int, b int);

+CREATE TABLE xt2(a int, b int);

+

+CREATE TABLE t5 (

+    a INT PRIMARY KEY AUTO_INCREMENT,

+    b VARCHAR(10) CHARACTER SET utf8 COLLATE utf8_bin

+);

+

+SET SESSION binlog_annotate_rows_events = OFF;

+

+INSERT INTO t1 VALUES (0,0), (1,1);

+

+SET SESSION binlog_annotate_rows_events = ON;

+

+UPDATE t1 SET b = b + 1;

+REPLACE t1 VALUES (1,1), (2,2), (3,3);

+

+INSERT INTO t2 VALUES (1,1), (2,2), (3,3);

+INSERT INTO t3 VALUES (1,1), (2,2), (3,3);

+DELETE t1, t2 FROM t1 INNER JOIN t2 INNER JOIN t3 WHERE t1.a=t2.a AND t2.a=t3.a;

+

+INSERT INTO xt1 VALUES (1,1), (2,2), (3,3);

+INSERT INTO t2 VALUES (1,1), (2,2), (3,3);

+DELETE xt1, t2 FROM xt1 INNER JOIN t2 INNER JOIN t3 WHERE xt1.a=t2.a AND t2.a=t3.a;

+

+INSERT INTO xt1 VALUES (1,1), (2,2), (3,3);

+INSERT INTO xt2 VALUES (1,1), (2,2), (3,3);

+DELETE xt1, xt2 FROM xt1 INNER JOIN xt2 INNER JOIN t3 WHERE xt1.a=xt2.a AND xt2.a=t3.a;

+

+INSERT INTO t5(b) VALUES ('foo'), ('bar'), ('baz');

+SET NAMES latin1;

+INSERT INTO t5(b) VALUES ('gås');

+SET NAMES utf8;

+INSERT INTO t5(b) VALUES ('gås');

+SET NAMES latin1;

+

+FLUSH LOGS;

+

+--echo ########################################################################

+--echo # TABLES ON MASTER

+--echo ########################################################################

+--enable_query_log

+

+SELECT * FROM t1 ORDER BY a;

+SELECT * FROM t2 ORDER BY a;

+SELECT * FROM t3 ORDER BY a;

+SELECT * FROM t5 ORDER BY a;

+

+sync_slave_with_master;

+--echo ########################################################################

+--echo # TABLES ON SLAVE: should be the same as on master

+--echo ########################################################################

+--disable_query_log

+USE test1;

+--enable_query_log

+

+SELECT * FROM t1 ORDER BY a;

+SELECT * FROM t2 ORDER BY a;

+SELECT * FROM t3 ORDER BY a;

+SELECT * FROM t5 ORDER BY a;

+

+--echo ########################################################################

+--echo # EVENTS ON SLAVE

+let $annotate= `select @@global.replicate_annotate_rows_events`;

+if ($annotate)

+{

+  --echo # The following Annotate_rows events should appear below:

+  --echo # - UPDATE t1 SET b = b + 1;

+  --echo # - REPLACE t1 VALUES (1,1), (2,2), (3,3);

+  --echo # - INSERT INTO t2 VALUES (1,1), (2,2), (3,3)

+  --echo # - INSERT INTO t3 VALUES (1,1), (2,2), (3,3)

+  --echo # - DELETE t1, t2 FROM <...>

+  --echo # - INSERT INTO t2 VALUES (1,1), (2,2), (3,3)

+  --echo # - DELETE xt1, t2 FROM <...>

+  --echo # - INSERT INTO t5(b) VALUES <...> (3 instances)

+}

+if (!$annotate)

+{

+  --echo # No Annotate_rows events should appear below

+}

+--echo ########################################################################

+FLUSH LOGS;

+

+--source include/binlog_start_pos.inc

+let $start_pos= `select @binlog_start_pos`;

+--replace_column 2 # 5 #

+--replace_result $start_pos <start_pos>

+--replace_regex /table_id: [0-9]+/table_id: #/ /\/\* xid=.* \*\//\/* xid= *\//

+--eval show binlog events in 'slave-bin.000001' from $start_pos

+

+--echo # 

+--echo ########################################################################

+--echo # INSERTs DELAYED ON MASTERs

+--echo ########################################################################

+connection master;

+SET SESSION binlog_annotate_rows_events = ON;

+INSERT DELAYED INTO test1.t4 VALUES (1,1);

+FLUSH TABLES;

+SELECT * FROM test1.t4 ORDER BY a;

+

+sync_slave_with_master;

+connection master;

+sync_slave_with_master;

+

+--echo ########################################################################

+--echo # ON SLAVE

+--echo # No Annotate_rows events should appear below

+--echo ########################################################################

+FLUSH LOGS;

+

+--exec $MYSQL --host=127.0.0.1 --port=$SLAVE_MYPORT test -e "show binlog events in 'slave-bin.000002'" > $MYSQLTEST_VARDIR/tmp/annotated_events.txt

+perl;

+    open F, '<', "$ENV{MYSQLTEST_VARDIR}/tmp/annotated_events.txt" or die;

+    binmode STDOUT;

+    while (defined ($_ = <F>)) {

+        if (/Annotate_rows/) {

+            s/[0-9]+\sAnnotate_rows\s[0-9]+\s[0-9]+/# Annotate_rows # #/;

+            print($_);

+            $_ = <F>;

+            s/[0-9]+\sTable_map\s[0-9]+\s[0-9]+\stable_id:\s[0-9]+/# Table_map # # table_id: #/;

+            print($_);

+        }

+    }

+EOF

+

+# Clean-up

+connection master;

+--disable_query_log

+DROP DATABASE test1;

+sync_slave_with_master;

+--enable_query_log

+

diff -ruN a/mysql-test/include/binlog_start_pos.inc b/mysql-test/include/binlog_start_pos.inc

--- a/mysql-test/include/binlog_start_pos.inc	1970-01-01 03:00:00.000000000 +0300

+++ b/mysql-test/include/binlog_start_pos.inc	2010-08-18 18:35:54.559911931 +0400

@@ -0,0 +1,26 @@

+##############################################################################

+#

+# binlog_start_pos is the postion of the the first event in the binary log

+# which follows the Format description event. Intended to reduce test suite

+# dependance on the Format description event length changes (e.g. in case

+# of adding new events). Evaluated as:

+#  

+#   binlog_start_pos = 4  /* binlog header */ +

+#                      (Format_description_log_event length)

+#

+#   Format_description_log_event length = 

+#                      19 /* event common header */ +

+#                      57 /* misc stuff in the Format description header */ +

+#                      number of events.

+# 

+# With current number of events = 160,

+#

+#   binlog_start_pos = 4 + 19 + 57 + 160 = 240.

+#

+##############################################################################

+

+let $binlog_start_pos=240;

+--disable_query_log

+SET @binlog_start_pos=240;

+--enable_query_log

+

diff -ruN a/mysql-test/include/show_binlog_events2.inc b/mysql-test/include/show_binlog_events2.inc

--- a/mysql-test/include/show_binlog_events2.inc	2010-07-09 17:03:24.000000000 +0400

+++ b/mysql-test/include/show_binlog_events2.inc	2010-08-18 18:35:54.559911931 +0400

@@ -1,4 +1,4 @@

---let $binlog_start=106

+--let $binlog_start=240

 --replace_result $binlog_start <binlog_start>

 --replace_column 2 # 5 #

 --replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/

diff -ruN a/mysql-test/include/show_binlog_events.inc b/mysql-test/include/show_binlog_events.inc

--- a/mysql-test/include/show_binlog_events.inc	2010-07-09 17:03:24.000000000 +0400

+++ b/mysql-test/include/show_binlog_events.inc	2010-08-18 18:35:54.559911931 +0400

@@ -3,7 +3,7 @@

 #

 # Useage: 

 # let $binlog_file= master-bin.000002; 

-# let $binlog_start= 106; 

+# let $binlog_start= 240; 

 # let $binlog_limit= 1, 3; 

 # source include/show_binlog_events.inc;

 #

diff -ruN 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	2010-07-09 19:02:50.000000000 +0600

+++ b/mysql-test/r/ctype_cp932_binlog_stm.result	2010-11-01 15:54:03.000000000 +0500

@@ -44,8 +44,6 @@

 master-bin.000001	#	Query	#	#	use `test`; DROP PROCEDURE bug18293

 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE t4

 End of 5.0 tests

-SHOW BINLOG EVENTS FROM 365;

-ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Wrong offset or I/O error

 Bug#44352 UPPER/LOWER function doesn't work correctly on cp932 and sjis environment.

 CREATE TABLE t1 (a varchar(16)) character set cp932;

 INSERT INTO t1 VALUES (0x8372835E),(0x8352835E);

diff -ruN a/mysql-test/r/mysqlbinlog.result b/mysql-test/r/mysqlbinlog.result

--- a/mysql-test/r/mysqlbinlog.result	2010-07-09 17:03:02.000000000 +0400

+++ b/mysql-test/r/mysqlbinlog.result	2010-08-18 18:35:54.619874038 +0400

@@ -1,15 +1,17 @@

 reset master;

+SET @save_binlog_size= @@global.max_binlog_size;

+SET @@global.max_binlog_size= 4096;

 set timestamp=1000000000;

 drop table if exists t1,t2,t3,t4,t5,t03,t04;

 create table t1 (word varchar(20));

 create table t2 (id int auto_increment not null primary key);

 insert into t1 values ("abirvalg");

 insert into t2 values ();

-load data infile '../../std_data/words.dat' into table t1;

-load data infile '../../std_data/words.dat' into table t1;

-load data infile '../../std_data/words.dat' into table t1;

-load data infile '../../std_data/words.dat' into table t1;

-load data infile '../../std_data/words.dat' into table t1;

+load data infile '../../std_data/words3.dat' into table t1;

+load data infile '../../std_data/words3.dat' into table t1;

+load data infile '../../std_data/words3.dat' into table t1;

+load data infile '../../std_data/words3.dat' into table t1;

+load data infile '../../std_data/words3.dat' into table t1;

 insert into t1 values ("Alas");

 flush logs;

@@ -220,7 +222,6 @@

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

 DELIMITER /*!*/;

 ROLLBACK/*!*/;

-use test/*!*/;

 SET TIMESTAMP=1108844556/*!*/;

 SET @@session.pseudo_thread_id=999999999/*!*/;

 SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;

@@ -228,6 +229,7 @@

 SET @@session.collation_database=DEFAULT/*!*/;

 BEGIN

 /*!*/;

+use test/*!*/;

 SET TIMESTAMP=1108844555/*!*/;

 insert t1 values (1)

 /*!*/;

@@ -239,7 +241,6 @@

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

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

 DELIMITER /*!*/;

-use test/*!*/;

 SET TIMESTAMP=1108844556/*!*/;

 SET @@session.pseudo_thread_id=999999999/*!*/;

 SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;

@@ -247,6 +248,7 @@

 SET @@session.collation_database=DEFAULT/*!*/;

 BEGIN

 /*!*/;

+use test/*!*/;

 SET TIMESTAMP=1108844555/*!*/;

 insert t1 values (1)

 /*!*/;

@@ -255,6 +257,7 @@

 ROLLBACK /* added by mysqlbinlog */;

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

 drop table t1,t2;

+SET @@global.max_binlog_size= @save_binlog_size;

 flush logs;

 flush logs;

 select * from t5  /* must be (1),(1) */;

@@ -377,14 +380,14 @@

 /*!*/;

 SET TIMESTAMP=1000000000/*!*/;

 SET @@session.collation_database=7/*!*/;

-LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-a-0' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`)

+LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`)

 /*!*/;

 SET TIMESTAMP=1000000000/*!*/;

 SET @@session.collation_database=DEFAULT/*!*/;

-LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-b-0' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`)

+LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`)

 /*!*/;

 SET TIMESTAMP=1000000000/*!*/;

-LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-c-0' INTO TABLE `t1` CHARACTER SET koi8r FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`)

+LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/tmp/SQL_LOAD_MB-#-#' INTO TABLE `t1` CHARACTER SET koi8r FIELDS TERMINATED BY '\t' ENCLOSED BY '' ESCAPED BY '\\' LINES TERMINATED BY '\n' (`a`)

 /*!*/;

 SET TIMESTAMP=1000000000/*!*/;

 drop table t1

@@ -581,7 +584,6 @@

 SET @@session.collation_database=DEFAULT/*!*/;

 BEGIN

 /*!*/;

-use test/*!*/;

 SET TIMESTAMP=1266652094/*!*/;

 SavePoint mixed_cases

 /*!*/;

@@ -592,11 +594,9 @@

 SET TIMESTAMP=1266652094/*!*/;

 INSERT INTO db1.t1 VALUES(40)

 /*!*/;

-use test/*!*/;

 SET TIMESTAMP=1266652094/*!*/;

 ROLLBACK TO mixed_cases

 /*!*/;

-use db1/*!*/;

 SET TIMESTAMP=1266652094/*!*/;

 INSERT INTO db1.t2 VALUES("after rollback to")

 /*!*/;

@@ -624,7 +624,6 @@

 SET @@session.collation_database=DEFAULT/*!*/;

 BEGIN

 /*!*/;

-use test/*!*/;

 SET TIMESTAMP=1266652094/*!*/;

 SavePoint mixed_cases

 /*!*/;

diff -ruN a/mysql-test/std_data/words3.dat b/mysql-test/std_data/words3.dat

--- a/mysql-test/std_data/words3.dat	1970-01-01 03:00:00.000000000 +0300

+++ b/mysql-test/std_data/words3.dat	2010-08-18 18:35:54.559911931 +0400

@@ -0,0 +1,66 @@

+Aarhus

+Aaron

+Ababa

+aback

+abaft

+abandon

+abandoned

+abandoning

+abandonment

+abandons

+Aarhus

+Aaron

+Ababa

+aback

+abaft

+abandon

+abandoned

+abandoning

+abandonment

+abandons

+abase

+abased

+abasement

+abasements

+abases

+abash

+abashed

+abashes

+abashing

+abasing

+abate

+abated

+abatement

+abatements

+abater

+abates

+abating

+Abba

+abbe

+abbey

+abbeys

+abbot

+abbots

+Abbott

+abbreviate

+abbreviated

+abbreviates

+abbreviating

+abbreviation

+abbreviations

+Abby

+abdomen

+abdomens

+abdominal

+abduct

+abducted

+abduction

+abductions

+abductor

+abductors

+abducts

+Abe

+abed

+Abel

+Abelian

+Abelson

diff -ruN a/mysql-test/suite/binlog/r/binlog_row_annotate.result b/mysql-test/suite/binlog/r/binlog_row_annotate.result

--- a/mysql-test/suite/binlog/r/binlog_row_annotate.result	1970-01-01 03:00:00.000000000 +0300

+++ b/mysql-test/suite/binlog/r/binlog_row_annotate.result	2010-08-18 18:35:54.559911931 +0400

@@ -0,0 +1,1219 @@

+#####################################################################################

+# The following Annotate_rows events should appear below:

+# - INSERT INTO test2.t2 VALUES (1), (2), (3)

+# - INSERT INTO test3.t3 VALUES (1), (2), (3)

+# - DELETE test1.t1, test2.t2 FROM <...>

+# - INSERT INTO test2.t2 VALUES (1), (2), (3)

+# - DELETE xtest1.xt1, test2.t2 FROM <...>

+#####################################################################################

+show binlog events in 'master-bin.000001' from <start_pos>;

+Log_name	Pos	Event_type	Server_id	End_log_pos	Info

+master-bin.000001	#	Query	1	#	DROP DATABASE IF EXISTS test1

+master-bin.000001	#	Query	1	#	DROP DATABASE IF EXISTS test2

+master-bin.000001	#	Query	1	#	DROP DATABASE IF EXISTS test3

+master-bin.000001	#	Query	1	#	CREATE DATABASE test1

+master-bin.000001	#	Query	1	#	CREATE DATABASE test2

+master-bin.000001	#	Query	1	#	CREATE DATABASE test3

+master-bin.000001	#	Query	1	#	BEGIN

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

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

+master-bin.000001	#	Query	1	#	COMMIT

+master-bin.000001	#	Query	1	#	BEGIN

+master-bin.000001	#	Annotate_rows	1	#	INSERT INTO test2.t2 VALUES (1), (2), (3)

+master-bin.000001	#	Table_map	1	#	table_id: # (test2.t2)

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

+master-bin.000001	#	Query	1	#	COMMIT

+master-bin.000001	#	Query	1	#	BEGIN

+master-bin.000001	#	Annotate_rows	1	#	INSERT INTO test3.t3 VALUES (1), (2), (3)

+master-bin.000001	#	Table_map	1	#	table_id: # (test3.t3)

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

+master-bin.000001	#	Query	1	#	COMMIT

+master-bin.000001	#	Query	1	#	BEGIN

+master-bin.000001	#	Annotate_rows	1	#	DELETE test1.t1, test2.t2

+FROM test1.t1 INNER JOIN test2.t2 INNER JOIN test3.t3

+WHERE test1.t1.a=test2.t2.a AND test2.t2.a=test3.t3.a

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

+master-bin.000001	#	Table_map	1	#	table_id: # (test2.t2)

+master-bin.000001	#	Delete_rows	1	#	table_id: #

+master-bin.000001	#	Delete_rows	1	#	table_id: # flags: STMT_END_F

+master-bin.000001	#	Query	1	#	COMMIT

+master-bin.000001	#	Query	1	#	BEGIN

+master-bin.000001	#	Annotate_rows	1	#	INSERT INTO test2.v2 VALUES (1), (2), (3)

+master-bin.000001	#	Table_map	1	#	table_id: # (test2.t2)

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

+master-bin.000001	#	Query	1	#	COMMIT

+master-bin.000001	#	Query	1	#	BEGIN

+master-bin.000001	#	Annotate_rows	1	#	DELETE xtest1.xt1, test2.t2

+FROM xtest1.xt1 INNER JOIN test2.t2 INNER JOIN test3.t3

+WHERE xtest1.xt1.a=test2.t2.a AND test2.t2.a=test3.t3.a

+master-bin.000001	#	Table_map	1	#	table_id: # (test2.t2)

+master-bin.000001	#	Delete_rows	1	#	table_id: # flags: STMT_END_F

+master-bin.000001	#	Query	1	#	COMMIT

+master-bin.000001	#	Rotate	1	#	master-bin.000002;pos=4

+#

+#####################################################################################

+# mysqlbinlog

+# The following Annotates should appear in this output:

+# - INSERT INTO test2.t2 VALUES (1), (2), (3)

+# - INSERT INTO test3.t3 VALUES (1), (2), (3)

+# - DELETE test1.t1, test2.t2 FROM <...> (with two subsequent Table maps)

+# - INSERT INTO test2.t2 VALUES (1), (2), (3)

+# - DELETE xtest1.xt1, test2.t2 FROM <...> (with one subsequent Table map)

+#####################################################################################

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

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

+DELIMITER /*!*/;

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Start: binlog v 4, server v #.##.## created 010909  4:46:40 at startup

+ROLLBACK/*!*/;

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+SET @@session.pseudo_thread_id=#/*!*/;

+SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;

+SET @@session.sql_mode=0/*!*/;

+SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;

+/*!\C latin1 *//*!*/;

+SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;

+SET @@session.lc_time_names=0/*!*/;

+SET @@session.collation_database=DEFAULT/*!*/;

+DROP DATABASE IF EXISTS test1

+/*!*/;

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+DROP DATABASE IF EXISTS test2

+/*!*/;

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+DROP DATABASE IF EXISTS test3

+/*!*/;

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+CREATE DATABASE test1

+/*!*/;

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+CREATE DATABASE test2

+/*!*/;

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+CREATE DATABASE test3

+/*!*/;

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+BEGIN

+/*!*/;

+# at #

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Table_map: `test1`.`t1` mapped to number #

+#010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F

+### INSERT INTO test1.t1

+### SET

+###   @1=1 /* INT meta=0 nullable=1 is_null=0 */

+### INSERT INTO test1.t1

+### SET

+###   @1=2 /* INT meta=0 nullable=1 is_null=0 */

+### INSERT INTO test1.t1

+### SET

+###   @1=3 /* INT meta=0 nullable=1 is_null=0 */

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+COMMIT

+/*!*/;

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+BEGIN

+/*!*/;

+# at #

+# at #

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Annotate_rows:

+#Q> INSERT INTO test2.t2 VALUES (1), (2), (3)

+#010909  4:46:40 server id #  end_log_pos # 	Table_map: `test2`.`t2` mapped to number #

+#010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F

+### INSERT INTO test2.t2

+### SET

+###   @1=1 /* INT meta=0 nullable=1 is_null=0 */

+### INSERT INTO test2.t2

+### SET

+###   @1=2 /* INT meta=0 nullable=1 is_null=0 */

+### INSERT INTO test2.t2

+### SET

+###   @1=3 /* INT meta=0 nullable=1 is_null=0 */

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+COMMIT

+/*!*/;

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+BEGIN

+/*!*/;

+# at #

+# at #

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Annotate_rows:

+#Q> INSERT INTO test3.t3 VALUES (1), (2), (3)

+#010909  4:46:40 server id #  end_log_pos # 	Table_map: `test3`.`t3` mapped to number #

+#010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F

+### INSERT INTO test3.t3

+### SET

+###   @1=1 /* INT meta=0 nullable=1 is_null=0 */

+### INSERT INTO test3.t3

+### SET

+###   @1=2 /* INT meta=0 nullable=1 is_null=0 */

+### INSERT INTO test3.t3

+### SET

+###   @1=3 /* INT meta=0 nullable=1 is_null=0 */

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+COMMIT

+/*!*/;

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+BEGIN

+/*!*/;

+# at #

+# at #

+# at #

+# at #

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Annotate_rows:

+#Q> DELETE test1.t1, test2.t2

+#Q> FROM test1.t1 INNER JOIN test2.t2 INNER JOIN test3.t3

+#Q> WHERE test1.t1.a=test2.t2.a AND test2.t2.a=test3.t3

+#010909  4:46:40 server id #  end_log_pos # 	Table_map: `test1`.`t1` mapped to number #

+#010909  4:46:40 server id #  end_log_pos # 	Table_map: `test2`.`t2` mapped to number #

+#010909  4:46:40 server id #  end_log_pos # 	Delete_rows: table id #

+#010909  4:46:40 server id #  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F

+### DELETE FROM test1.t1

+### WHERE

+###   @1=1 /* INT meta=0 nullable=1 is_null=0 */

+### DELETE FROM test1.t1

+### WHERE

+###   @1=2 /* INT meta=0 nullable=1 is_null=0 */

+### DELETE FROM test1.t1

+### WHERE

+###   @1=3 /* INT meta=0 nullable=1 is_null=0 */

+### DELETE FROM test2.t2

+### WHERE

+###   @1=1 /* INT meta=0 nullable=1 is_null=0 */

+### DELETE FROM test2.t2

+### WHERE

+###   @1=2 /* INT meta=0 nullable=1 is_null=0 */

+### DELETE FROM test2.t2

+### WHERE

+###   @1=3 /* INT meta=0 nullable=1 is_null=0 */

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+COMMIT

+/*!*/;

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+BEGIN

+/*!*/;

+# at #

+# at #

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Annotate_rows:

+#Q> INSERT INTO test2.v2 VALUES (1), (2), (3)

+#010909  4:46:40 server id #  end_log_pos # 	Table_map: `test2`.`t2` mapped to number #

+#010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F

+### INSERT INTO test2.t2

+### SET

+###   @1=1 /* INT meta=0 nullable=1 is_null=0 */

+### INSERT INTO test2.t2

+### SET

+###   @1=2 /* INT meta=0 nullable=1 is_null=0 */

+### INSERT INTO test2.t2

+### SET

+###   @1=3 /* INT meta=0 nullable=1 is_null=0 */

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+COMMIT

+/*!*/;

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+BEGIN

+/*!*/;

+# at #

+# at #

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Annotate_rows:

+#Q> DELETE xtest1.xt1, test2.t2

+#Q> FROM xtest1.xt1 INNER JOIN test2.t2 INNER JOIN test3.t3

+#Q> WHERE xtest1.xt1.a=test2.t2.a AND test2.t2.a=test3.t3

+#010909  4:46:40 server id #  end_log_pos # 	Table_map: `test2`.`t2` mapped to number #

+#010909  4:46:40 server id #  end_log_pos # 	Delete_rows: table id # flags: STMT_END_F

+### DELETE FROM test2.t2

+### WHERE

+###   @1=3 /* INT meta=0 nullable=1 is_null=0 */

+### DELETE FROM test2.t2

+### WHERE

+###   @1=2 /* INT meta=0 nullable=1 is_null=0 */

+### DELETE FROM test2.t2

+### WHERE

+###   @1=1 /* INT meta=0 nullable=1 is_null=0 */

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+COMMIT

+/*!*/;

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Rotate to master-bin.000002  pos: 4

+DELIMITER ;

+# End of log file

+ROLLBACK /* added by mysqlbinlog */;

+/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;

+#

+#####################################################################################

+# mysqlbinlog --database=test1

+# The following Annotate should appear in this output:

+# - DELETE test1.t1, test2.t2 FROM <...>

+#####################################################################################

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

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

+DELIMITER /*!*/;

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Start: binlog v 4, server v #.##.## created 010909  4:46:40 at startup

+ROLLBACK/*!*/;

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+SET @@session.pseudo_thread_id=#/*!*/;

+SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;

+SET @@session.sql_mode=0/*!*/;

+SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;

+/*!\C latin1 *//*!*/;

+SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;

+SET @@session.lc_time_names=0/*!*/;

+SET @@session.collation_database=DEFAULT/*!*/;

+DROP DATABASE IF EXISTS test1

+/*!*/;

+# at #

+# at #

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+CREATE DATABASE test1

+/*!*/;

+# at #

+# at #

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+BEGIN

+/*!*/;

+# at #

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Table_map: `test1`.`t1` mapped to number #

+#010909  4:46:40 server id #  end_log_pos # 	Write_rows: table id # flags: STMT_END_F

+### INSERT INTO test1.t1

+### SET

+###   @1=1 /* INT meta=0 nullable=1 is_null=0 */

+### INSERT INTO test1.t1

+### SET

+###   @1=2 /* INT meta=0 nullable=1 is_null=0 */

+### INSERT INTO test1.t1

+### SET

+###   @1=3 /* INT meta=0 nullable=1 is_null=0 */

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+COMMIT

+/*!*/;

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+BEGIN

+/*!*/;

+# at #

+# at #

+# at #

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+COMMIT

+/*!*/;

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+BEGIN

+/*!*/;

+# at #

+# at #

+# at #

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+COMMIT

+/*!*/;

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+BEGIN

+/*!*/;

+# at #

+# at #

+# at #

+# at #

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Annotate_rows:

+#Q> DELETE test1.t1, test2.t2

+#Q> FROM test1.t1 INNER JOIN test2.t2 INNER JOIN test3.t3

+#Q> WHERE test1.t1.a=test2.t2.a AND test2.t2.a=test3.t3

+#010909  4:46:40 server id #  end_log_pos # 	Table_map: `test1`.`t1` mapped to number #

+#010909  4:46:40 server id #  end_log_pos # 	Delete_rows: table id #

+### DELETE FROM test1.t1

+### WHERE

+###   @1=1 /* INT meta=0 nullable=1 is_null=0 */

+### DELETE FROM test1.t1

+### WHERE

+###   @1=2 /* INT meta=0 nullable=1 is_null=0 */

+### DELETE FROM test1.t1

+### WHERE

+###   @1=3 /* INT meta=0 nullable=1 is_null=0 */

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+COMMIT

+/*!*/;

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+BEGIN

+/*!*/;

+# at #

+# at #

+# at #

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+COMMIT

+/*!*/;

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+BEGIN

+/*!*/;

+# at #

+# at #

+# at #

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+COMMIT

+/*!*/;

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Rotate to master-bin.000002  pos: 4

+DELIMITER ;

+# End of log file

+ROLLBACK /* added by mysqlbinlog */;

+/*!50003 SET COMPLETION_TYPE=@OLD_COMPLETION_TYPE*/;

+#

+#####################################################################################

+# mysqlbinlog --skip-annotate-rows-events

+# No Annotates should appear in this output

+#####################################################################################

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

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

+DELIMITER /*!*/;

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Start: binlog v 4, server v #.##.## created 010909  4:46:40 at startup

+ROLLBACK/*!*/;

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+SET @@session.pseudo_thread_id=#/*!*/;

+SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=1, @@session.unique_checks=1, @@session.autocommit=1/*!*/;

+SET @@session.sql_mode=0/*!*/;

+SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/;

+/*!\C latin1 *//*!*/;

+SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/;

+SET @@session.lc_time_names=0/*!*/;

+SET @@session.collation_database=DEFAULT/*!*/;

+DROP DATABASE IF EXISTS test1

+/*!*/;

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+DROP DATABASE IF EXISTS test2

+/*!*/;

+# at #

+#010909  4:46:40 server id #  end_log_pos # 	Query	thread_id=#	exec_time=#	error_code=0

+SET TIMESTAMP=1000000000/*!*/;

+DROP DATABASE IF EXISTS test3

+/*!*/;