bzr merge -r3904..3928 lp:codership-mysql/5.5

This is now otherwise on level wsrep-25.9, but storage/innobase has not been fully merged
wsrep-5.5 is not good source for that, so we probably have to cherry pick innodb changes from wsrep-5.6

1 files changed, 32 insertions, 24 deletions

diff --git a/wsrep/wsrep_dummy.c b/wsrep/wsrep_dummy.c
index 33b61e6821f..3c7a7c2e354 100644
--- a/wsrep/wsrep_dummy.c
+++ b/wsrep/wsrep_dummy.c
@@ -101,9 +101,7 @@ static wsrep_status_t dummy_pre_commit(
     wsrep_t* w,
     const wsrep_conn_id_t   conn_id    __attribute__((unused)),
     wsrep_ws_handle_t*      ws_handle  __attribute__((unused)),
-//    const struct wsrep_buf* data       __attribute__((unused)),
-//    const long              count      __attribute__((unused)),
-    uint64_t                flags      __attribute__((unused)),
+    uint32_t                flags      __attribute__((unused)),
     wsrep_trx_meta_t*       meta       __attribute__((unused)))
 {
     WSREP_DBUG_ENTER(w);
@@ -148,7 +146,7 @@ static wsrep_status_t dummy_append_key(
     wsrep_t* w,
     wsrep_ws_handle_t*     ws_handle  __attribute__((unused)),
     const wsrep_key_t*     key        __attribute__((unused)),
-    const int              key_num    __attribute__((unused)),
+    const size_t           key_num    __attribute__((unused)),
     const wsrep_key_type_t key_type   __attribute__((unused)),
     const bool             copy       __attribute__((unused)))
 {
@@ -160,7 +158,7 @@ static wsrep_status_t dummy_append_data(
     wsrep_t* w,
     wsrep_ws_handle_t*      ws_handle  __attribute__((unused)),
     const struct wsrep_buf* data       __attribute__((unused)),
-    const int               count      __attribute__((unused)),
+    const size_t            count      __attribute__((unused)),
     const wsrep_data_type_t type       __attribute__((unused)),
     const bool              copy       __attribute__((unused)))
 {
@@ -188,9 +186,9 @@ static wsrep_status_t dummy_to_execute_start(
     wsrep_t* w,
     const wsrep_conn_id_t   conn_id __attribute__((unused)),
     const wsrep_key_t*      key     __attribute__((unused)),
-    const int               key_num __attribute__((unused)),
+    const size_t            key_num __attribute__((unused)),
     const struct wsrep_buf* data    __attribute__((unused)),
-    const int               count   __attribute__((unused)),
+    const size_t            count   __attribute__((unused)),
     wsrep_trx_meta_t*       meta    __attribute__((unused)))
 {
     WSREP_DBUG_ENTER(w);
@@ -205,14 +203,24 @@ static wsrep_status_t dummy_to_execute_end(
     return WSREP_OK;
 }
 
-static wsrep_status_t dummy_preordered(
-    wsrep_t*                w,
-    const wsrep_uuid_t*     source_id __attribute__((unused)),
-    int                     pa_range  __attribute__((unused)),
-    const struct wsrep_buf* data      __attribute__((unused)),
-    int                     count     __attribute__((unused)),
-    uint64_t                flags     __attribute__((unused)),
-    wsrep_bool_t            copy      __attribute__((unused)))
+static wsrep_status_t dummy_preordered_collect(
+    wsrep_t*                 w,
+    wsrep_po_handle_t*       handle    __attribute__((unused)),
+    const struct wsrep_buf*  data      __attribute__((unused)),
+    size_t                   count     __attribute__((unused)),
+    wsrep_bool_t             copy      __attribute__((unused)))
+{
+    WSREP_DBUG_ENTER(w);
+    return WSREP_OK;
+}
+
+static wsrep_status_t dummy_preordered_commit(
+    wsrep_t*                 w,
+    wsrep_po_handle_t*       handle    __attribute__((unused)),
+    const wsrep_uuid_t*      source_id __attribute__((unused)),
+    uint32_t                 flags     __attribute__((unused)),
+    int                      pa_range  __attribute__((unused)),
+    wsrep_bool_t             commit    __attribute__((unused)))
 {
     WSREP_DBUG_ENTER(w);
     return WSREP_OK;
@@ -220,8 +228,8 @@ static wsrep_status_t dummy_preordered(
 
 static wsrep_status_t dummy_sst_sent(
     wsrep_t* w,
-    const wsrep_uuid_t* uuid   __attribute__((unused)),
-    wsrep_seqno_t       seqno  __attribute__((unused)))
+    const wsrep_gtid_t* state_id  __attribute__((unused)),
+    const int           rcode     __attribute__((unused)))
 {
     WSREP_DBUG_ENTER(w);
     return WSREP_OK;
@@ -229,10 +237,10 @@ static wsrep_status_t dummy_sst_sent(
 
 static wsrep_status_t dummy_sst_received(
     wsrep_t* w,
-    const wsrep_uuid_t* uuid      __attribute__((unused)),
-    const wsrep_seqno_t seqno     __attribute__((unused)),
-    const char*         state     __attribute__((unused)),
-    const size_t        state_len __attribute__((unused)))
+    const wsrep_gtid_t* state_id  __attribute__((unused)),
+    const void*         state     __attribute__((unused)),
+    const size_t        state_len __attribute__((unused)),
+    const int           rcode     __attribute__((unused)))
 {
     WSREP_DBUG_ENTER(w);
     return WSREP_OK;
@@ -241,7 +249,7 @@ static wsrep_status_t dummy_sst_received(
 static wsrep_status_t dummy_snapshot(
     wsrep_t* w,
     const void*  msg        __attribute__((unused)),
-    const int    msg_len    __attribute__((unused)),
+    const size_t msg_len    __attribute__((unused)),
     const char*  donor_spec __attribute__((unused)))
 {
     WSREP_DBUG_ENTER(w);
@@ -341,7 +349,8 @@ static wsrep_t dummy_iface = {
     &dummy_free_connection,
     &dummy_to_execute_start,
     &dummy_to_execute_end,
-    &dummy_preordered,
+    &dummy_preordered_collect,
+    &dummy_preordered_commit,
     &dummy_sst_sent,
     &dummy_sst_received,
     &dummy_snapshot,
@@ -358,7 +367,6 @@ static wsrep_t dummy_iface = {
     WSREP_NONE,
     WSREP_INTERFACE_VERSION,
     "Codership Oy <info@codership.com>",
-    0xdeadbeef,
     &dummy_free,
     NULL,
     NULL