mmts extension import

kelvich · kelvich · commit 0bfab3497887 · 2017-11-13T02:17:35.000+03:00
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM kelvich/postgres_cluster
+FROM pgproent
 
 RUN mkdir /pg/mmts
 COPY ./ /pg/mmts/
diff --git a/multimaster.c b/multimaster.c
@@ -4252,7 +4252,7 @@ static bool MtmTwoPhaseCommit(MtmCurrentTrans* x)
 	if (!x->isReplicated && x->isDistributed && x->containsDML) {
 		MtmGenerateGid(x->gid);
 		if (!x->isTransactionBlock) { 
-			BeginTransactionBlock();
+			BeginTransactionBlock(false);
 			x->isTransactionBlock = true;
 			CommitTransactionCommand();
 			StartTransactionCommand();
diff --git a/pglogical_apply.c b/pglogical_apply.c
@@ -673,7 +673,7 @@ process_remote_commit(StringInfo in)
 			} else { 				
 				/* prepare TBLOCK_INPROGRESS state for PrepareTransactionBlock() */
 				MTM_LOG2("PGLOGICAL_PREPARE commit: gid=%s", gid);
-				BeginTransactionBlock();
+				BeginTransactionBlock(false);
 				CommitTransactionCommand();
 				StartTransactionCommand();
 				

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM kelvich/postgres_cluster`
	`1`	`+FROM pgproent`
`2`	`2`
`3`	`3`	`RUN mkdir /pg/mmts`
`4`	`4`	`COPY ./ /pg/mmts/`