Merge branch 'master' of github.com:postgrespro/postgres_cluster

kelvich · kelvich · commit 0c4854304ad1 · 2016-04-08T17:08:38.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -2165,20 +2165,21 @@ Datum mtm_dump_lock_graph(PG_FUNCTION_ARGS)
 	{
 		size_t size;
 		char *data = RaftableGet(psprintf("lock-graph-%d", i+1), &size, NULL, true);
-		if (!data) continue;
-		GlobalTransactionId *gtid = (GlobalTransactionId *)data;
-		GlobalTransactionId *last = (GlobalTransactionId *)(data + size);
-		appendStringInfo(s, "node-%d lock graph: ", i+1);
-		while (gtid != last) { 
-			GlobalTransactionId *src = gtid++;
-			appendStringInfo(s, "%d:%d -> ", src->node, src->xid);
-			while (gtid->node != 0) {
-				GlobalTransactionId *dst = gtid++;
-				appendStringInfo(s, "%d:%d, ", dst->node, dst->xid);
+		if (data) { 
+			GlobalTransactionId *gtid = (GlobalTransactionId *)data;
+			GlobalTransactionId *last = (GlobalTransactionId *)(data + size);
+			appendStringInfo(s, "node-%d lock graph: ", i+1);
+			while (gtid != last) { 
+				GlobalTransactionId *src = gtid++;
+				appendStringInfo(s, "%d:%d -> ", src->node, src->xid);
+				while (gtid->node != 0) {
+					GlobalTransactionId *dst = gtid++;
+					appendStringInfo(s, "%d:%d, ", dst->node, dst->xid);
+				}
+				gtid += 1;
 			}
-			gtid += 1;
+			appendStringInfo(s, "\n");
 		}
-		appendStringInfo(s, "\n");
 	}
 	return CStringGetTextDatum(s->data);
 }
