[Commits] Rev 4514: MDEV-6676: Speculative parallel replication: Intermediate commit. in http://bazaar.launchpad.net/~maria-captains/maria/10.0

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Thu Nov 13 16:26:26 EET 2014


At http://bazaar.launchpad.net/~maria-captains/maria/10.0

------------------------------------------------------------
revno: 4514
revision-id: knielsen at knielsen-hq.org-20141015142722-yq06sjljcfbpyjlo
parent: knielsen at knielsen-hq.org-20141015140351-m3qii86avbjtiokn
committer: Kristian Nielsen <knielsen at knielsen-hq.org>
branch nick: work-10.0-mdev6676
timestamp: Wed 2014-10-15 16:27:22 +0200
message:
  MDEV-6676: Speculative parallel replication: Intermediate commit.
  
  Fix embedded server build.
=== modified file 'sql/rpl_mi.h'
--- a/sql/rpl_mi.h	2014-10-07 14:20:37 +0000
+++ b/sql/rpl_mi.h	2014-10-15 14:27:22 +0000
@@ -16,6 +16,18 @@
 #ifndef RPL_MI_H
 #define RPL_MI_H
 
+
+/*
+  Bit masks for the values in --slave-parallel-mode.
+  Note that these values cannot be changed - they are stored in master.info,
+  so need to be possible to read back in a different version of the server.
+*/
+#define SLAVE_PARALLEL_DOMAIN      (1ULL << 0)
+#define SLAVE_PARALLEL_GROUPCOMMIT (1ULL << 1)
+#define SLAVE_PARALLEL_TRX         (1ULL << 2)
+#define SLAVE_PARALLEL_WAITING     (1ULL << 3)
+
+
 #ifdef HAVE_REPLICATION
 
 #include "rpl_rli.h"

=== modified file 'sql/rpl_parallel.h'
--- a/sql/rpl_parallel.h	2014-10-07 14:20:37 +0000
+++ b/sql/rpl_parallel.h	2014-10-15 14:27:22 +0000
@@ -13,17 +13,6 @@ struct inuse_relaylog;
 
 
 /*
-  Bit masks for the values in --slave-parallel-mode.
-  Note that these values cannot be changed - they are stored in master.info,
-  so need to be possible to read back in a different version of the server.
-*/
-#define SLAVE_PARALLEL_DOMAIN      (1ULL << 0)
-#define SLAVE_PARALLEL_GROUPCOMMIT (1ULL << 1)
-#define SLAVE_PARALLEL_TRX         (1ULL << 2)
-#define SLAVE_PARALLEL_WAITING     (1ULL << 3)
-
-
-/*
   Structure used to keep track of the parallel replication of a batch of
   event-groups that group-committed together on the master.
 



More information about the commits mailing list