Aplly "Handle grab of LWLock" without tab/space clutter

Author: kelvich

contrib/mmts/arbiter.c

@@ -714,10 +714,11 @@ static void MtmSender(Datum arg)
 {
 	int nNodes = MtmMaxNodes;
 	int i;
+	MtmBuffer* txBuffer;
 
 	MtmBackgroundWorker = true;
 
-	MtmBuffer* txBuffer = (MtmBuffer*)palloc0(sizeof(MtmBuffer)*nNodes);
+	txBuffer = (MtmBuffer*)palloc0(sizeof(MtmBuffer)*nNodes);
 	MTM_ELOG(LOG, "Start arbiter sender %d", MyProcPid);
 	InitializeTimeouts();
 
@@ -1159,4 +1160,3 @@ static void MtmReceiver(Datum arg)
 	}
 	proc_exit(1); /* force restart of this bgwroker */
 }
-

contrib/mmts/multimaster.c

@@ -340,8 +340,7 @@ void MtmLock(LWLockMode mode)
 		atexit(MtmReleaseLocks);
 		MtmAtExitHookRegistered = true;
 	}
-	if (MtmLockCount != 0) {
-		Assert(Mtm->lastLockHolder == MyProcPid);
+	if (MtmLockCount != 0 && Mtm->lastLockHolder == MyProcPid) {
 		MtmLockCount += 1;
 	}
 	else
@@ -372,8 +371,11 @@ void MtmLock(LWLockMode mode)
 #endif
 		if (mode == LW_EXCLUSIVE) {
 			Assert(MtmLockCount == 0);
+			Assert(MyProcPid != 0);
 			Mtm->lastLockHolder = MyProcPid;
 			MtmLockCount = 1;
+		} else {
+			MtmLockCount = 0;
 		}
 	}
 }