mancha1
diff --git a/‎libbinlogevents/include/binlog_event.h
Lines changed: 4 additions & 1 deletion b/‎libbinlogevents/include/binlog_event.h
Lines changed: 4 additions & 1 deletion
diff --git a/‎libbinlogevents/include/control_events.h
Lines changed: 100 additions & 0 deletions b/‎libbinlogevents/include/control_events.h
Lines changed: 100 additions & 0 deletions
diff --git a/‎libbinlogevents/src/control_events.cpp
Lines changed: 59 additions & 18 deletions b/‎libbinlogevents/src/control_events.cpp
Lines changed: 59 additions & 18 deletions
diff --git a/‎mysql-test/extra/binlog_tests/binlog_xa_prepare_connection.inc
Lines changed: 31 additions & 0 deletions b/‎mysql-test/extra/binlog_tests/binlog_xa_prepare_connection.inc
Lines changed: 31 additions & 0 deletions
diff --git a/‎mysql-test/extra/binlog_tests/binlog_xa_prepare_disconnect.inc
Lines changed: 35 additions & 0 deletions b/‎mysql-test/extra/binlog_tests/binlog_xa_prepare_disconnect.inc
Lines changed: 35 additions & 0 deletions
@@ -323,6 +323,8 @@ enum Log_event_type
 
   VIEW_CHANGE_EVENT= 37,
 
+  /* Prepared XA transaction terminal event similar to Xid */
+  XA_PREPARE_LOG_EVENT= 38,
   /**
     Add new events here - right above this comment!
     Existing events (except ENUM_END_EVENT) should never change their numbers
@@ -782,7 +784,8 @@ class Binary_log_event
     IGNORABLE_HEADER_LEN= 0,
     ROWS_HEADER_LEN_V2= 10,
     TRANSACTION_CONTEXT_HEADER_LEN= 18,
-    VIEW_CHANGE_HEADER_LEN= 53
+    VIEW_CHANGE_HEADER_LEN= 53,
+    XA_PREPARE_HEADER_LEN= 0
   }; // end enum_post_header_length
 protected:
   /**
 
@@ -649,6 +649,106 @@ class Xid_event: public Binary_log_event
 #endif
 };
 
+/**
+  @class XA_prepare_event
+
+  An XA_prepare event is generated for a XA prepared transaction.
+  Like Xid_event it contans XID of the *prepared* transaction.
+
+  @section XA_prepare_event_binary_format Binary Format
+
+The Body has the following component:
+
+  <table>
+  <caption>Body for XA_prepare_event</caption>
+
+  <tr>
+    <th>Name</th>
+    <th>Format</th>
+    <th>Description</th>
+  </tr>
+
+  <tr>
+    <td>my_xid</td>
+    <td>a struct similar to mysql/plugin.h containing three members.</td>
+    <td>serialized XID representation of XA transaction.</td>
+  </tr>
+
+  <tr>
+    <td>xid</td>
+    <td>a pointer to XID object.</td>
+    <td>a reference to an object for mysql logger.</td>
+  </tr>
+
+  <tr>
+    <td>one_phase</td>
+    <td>a bool</td>
+    <td>the value specifies the current XA transaction commit method.</td>
+  </tr>
+  </table>
+  The Post-Header and Body for this event type are empty; it only has
+  the common header.
+*/
+
+class XA_prepare_event: public Binary_log_event
+{
+  /*
+    Struct def is copied from $MYSQL/include/mysql/plugin.h,
+    consult there about fine details.
+  */
+  static const int MY_XIDDATASIZE= 128;
+
+  struct st_mysql_xid {
+    long formatID;
+    long gtrid_length;
+    long bqual_length;
+    char data[MY_XIDDATASIZE];  /* Not \0-terminated */
+  };
+  typedef struct st_mysql_xid MY_XID;
+
+protected:
+  /* size of serialization buffer is explained in $MYSQL/sql/xa.h. */
+  static const uint16_t ser_buf_size=
+    8 + 2 * MY_XIDDATASIZE + 4 * sizeof(long) + 1;
+  MY_XID my_xid;
+  void *xid; /* Master side only */
+  bool one_phase;
+
+public:
+  /**
+    The minimal constructor of XA_prepare_event, it initializes the
+    instance variable xid and set the type_code as XID_EVENT in the
+    header object in Binary_log_event
+  */
+  XA_prepare_event(void *xid_arg, bool oph_arg)
+    : Binary_log_event(XA_PREPARE_LOG_EVENT), xid(xid_arg), one_phase(oph_arg)
+  {
+  }
+
+  /**
+    An XID event is generated for a commit of a transaction that modifies one or
+    more tables of an XA-capable storage engine
+    @param buf    Contains the serialized event.
+    @param fde    An FDE event, used to get the following information
+                     -binlog_version
+                     -server_version
+                     -post_header_len
+                     -common_header_len
+                     The content of this object
+                     depends on the binlog-version currently in use.
+  */
+  XA_prepare_event(const char *buf, const Format_description_event *fde);
+#ifndef HAVE_MYSYS
+  /*
+    todo: we need to find way how to exploit server's code of
+    serialize_xid()
+  */
+  void print_event_info(std::ostream& info) {};
+  void print_long_info(std::ostream& info)  {};
+#endif
+};
+
+
 /**
   @class Ignorable_event
 
 
@@ -156,8 +156,8 @@ Format_description_event::Format_description_event(uint8_t binlog_ver,
        Gtid_event::POST_HEADER_LENGTH,         /*ANONYMOUS_GTID_EVENT*/
        IGNORABLE_HEADER_LEN,
       TRANSACTION_CONTEXT_HEADER_LEN,
-      VIEW_CHANGE_HEADER_LEN
-
+      VIEW_CHANGE_HEADER_LEN,
+      XA_PREPARE_HEADER_LEN
     };
      /*
        Allows us to sanity-check that all events initialized their
@@ -522,6 +522,36 @@ Incident_event::Incident_event(const char *buf, unsigned int event_len,
   return;
 }
 
+/**
+    We create an object of Ignorable_log_event for unrecognized sub-class, while
+    decoding. So that we just update the position and continue.
+
+    @param buf                Contains the serialized event.
+    @param length             Length of the serialized event.
+    @param descr_event        An FDE event, used to get the
+                              following information
+                              -binlog_version
+                              -server_version
+                              -post_header_len
+                              -common_header_len
+                              The content of this object
+                              depends on the binlog-version currently in use.
+*/
+
+Ignorable_event::Ignorable_event(const char *buf,
+                                 const Format_description_event *descr_event)
+ : Binary_log_event(&buf, descr_event->binlog_version,
+                    descr_event->server_version)
+{}
+
+/**
+    Constructor for Xid_event at its decoding.
+
+    @param buf                Contains the serialized event.
+    @param description_event  An FDE event (see comments for
+                              Ignorable_event for fine details).
+*/
+
 Xid_event::
 Xid_event(const char* buf,
           const Format_description_event *description_event)
@@ -540,26 +570,37 @@ Xid_event(const char* buf,
 }
 
 /**
-    We create an object of Ignorable_log_event for unrecognized sub-class, while
-    decoding. So that we just update the position and continue.
+    Constructor for XA_prepare_event at its decoding.
 
     @param buf                Contains the serialized event.
-    @param length             Length of the serialized event.
-    @param description_event  An FDE event, used to get the
-                              following information
-                              -binlog_version
-                              -server_version
-                              -post_header_len
-                              -common_header_len
-                              The content of this object
-                              depends on the binlog-version currently in use.
+    @param description_event  An FDE event (see comments for
+                              Ignorable_event for fine details).
 */
-Ignorable_event::Ignorable_event(const char *buf,
-                                 const Format_description_event *descr_event)
- : Binary_log_event(&buf, descr_event->binlog_version,
-                    descr_event->server_version)
-{}
 
+XA_prepare_event::
+XA_prepare_event(const char* buf,
+                 const Format_description_event *description_event)
+ : Binary_log_event(&buf, description_event->binlog_version,
+                    description_event->server_version)
+{
+  uint32_t temp= 0;
+  uint8_t temp_byte;
+
+  buf+= description_event->post_header_len[XA_PREPARE_LOG_EVENT - 1];
+  memcpy(&temp_byte, buf, 1);
+  one_phase= (bool) temp_byte;
+  buf += sizeof(temp_byte);
+  memcpy(&temp, buf, sizeof(temp));
+  my_xid.formatID= le32toh(temp);
+  buf += sizeof(temp);
+  memcpy(&temp, buf, sizeof(temp));
+  my_xid.gtrid_length= le32toh(temp);
+  buf += sizeof(temp);
+  memcpy(&temp, buf, sizeof(temp));
+  my_xid.bqual_length= le32toh(temp);
+  buf += sizeof(temp);
+  memcpy(my_xid.data, buf, my_xid.gtrid_length + my_xid.bqual_length);
+}
 
 /**
   ctor to decode a Gtid_event
 
@@ -0,0 +1,31 @@
+#
+# This file initiate connections to run XA transactions up to
+# their prepare.
+# Connection name, transaction name and its content depends on
+# supplied parameters.
+#
+# param $type        type of transaction
+# param $index       index identifies the connection with those of type $type
+# param $sql_init1   a query to execute once connection is established
+# param $sql_init2   a query to execute once connection is established
+# param $sql_doit    a query to execute inside transaction
+#                    Note, the query may depend on tables created by caller
+#
+
+--connect (conn$index$type, 127.0.0.1,root,,test,$MASTER_MYPORT,)
+if ($sql_init1)
+{
+  --eval $sql_init1
+}
+if ($sql_init2)
+{
+  --eval $sql_init2
+}
+
+--eval XA START   'trx$index$type'
+if ($sql_doit)
+{
+  --eval $sql_doit
+}
+--eval XA END     'trx$index$type'
+--eval XA PREPARE 'trx$index$type'
@@ -0,0 +1,35 @@
+#
+# This file disconnects two connections. One actively and one through
+# kill. It is included by binlog_xa_prepared_do_and_restart.
+#
+# param $type              type of transaction
+# param $terminate_with    how to conclude actively disconnecte:
+#                          XA COMMIT or XA ROLLBACK
+# param $conn3_id          connection id of the being killed.
+# param $num_trx_prepared  number of transactions prepared so far
+#
+--connection default
+
+--echo *** $num_trx_prepared prepared transactions must be in the list ***
+--replace_column 2 LEN1 3 LEN2 4 TRX_N
+XA RECOVER;
+
+--connection conn1$type
+--let $conn1_id=`SELECT connection_id()`
+--disconnect conn1$type
+
+--connection default
+--let $wait_condition= SELECT count(*) = 0 FROM v_processlist WHERE PROCESSLIST_ID = $conn1_id
+--source include/wait_condition.inc
+
+# It will conclude now
+--eval  $terminate_with 'trx1$type'
+
+--replace_result $conn3_id CONN_ID
+--eval KILL connection $conn3_id
+
+--let $wait_condition= SELECT count(*) = 0 FROM v_processlist WHERE PROCESSLIST_ID = $conn3_id
+--source include/wait_condition.inc
+
+# It will conclude now
+--eval  $terminate_with 'trx3$type'