Changes:

1) Add initialization for trx->xid in InnoDB trx pool

2) Add server UUID in the XID of InnoDB SR transactions

3) Modify trx_recover_for_mysql_callback() so that recovered InnoDB SR
transactions are not made visible to MySQL as recovered XA transactions.

4) Modify how SR transactions are detected and the wsrep_is_sr flag is
set for InnoDB SR transactions.

include/wsrep/client_state.hpp

@@ -926,7 +926,16 @@ namespace wsrep
         {
             return transaction_;
         }
-
+#ifdef WITH_WSREP_SR_SPEEDUP
+        /**
+         * Return a reference to the transaction associated
+         * with the client state.
+         */
+        wsrep::transaction& transaction()
+        {
+            return transaction_;
+        }
+#endif /* WITH_WSREP_SR_SPEEDUP */
         const wsrep::ws_meta& toi_meta() const
         {
             return toi_meta_;

include/wsrep/storage_service.hpp

@@ -82,6 +82,10 @@ namespace wsrep
          */
         virtual int remove_fragments() = 0;
 
+#ifdef WITH_WSREP_SR_SPEEDUP
+	int set_fragments_from_table() {return 0;};
+#endif /* WITH_WSREP_SR_SPEEDUP */
+
         /**
          * Commit the transaction.
          */

include/wsrep/transaction.hpp

@@ -142,6 +142,9 @@ namespace wsrep
         void xa_detach();
 
         int xa_replay(wsrep::unique_lock<wsrep::mutex>&);
+#ifdef WITH_WSREP_SR_SPEEDUP
+	int set_fragments_from_table();
+#endif /* WITH_WSREP_SR_SPEEDUP */
 
         bool pa_unsafe() const { return pa_unsafe_; }
         void pa_unsafe(bool pa_unsafe) { pa_unsafe_ = pa_unsafe; }