Merge branch 'REL9_5_STABLE' into PGPRO9_5

vbwagner · vbwagner · commit ce9f2627fe7f · 2016-03-31T09:36:18.000+03:00
Merge last-minute fix
diff --git a/src/backend/replication/logical/decode.c b/src/backend/replication/logical/decode.c
@@ -476,7 +476,7 @@ DecodeCommit(LogicalDecodingContext *ctx, XLogRecordBuffer *buf,
 {
 	XLogRecPtr	origin_lsn = InvalidXLogRecPtr;
 	TimestampTz	commit_time = parsed->xact_time;
-	XLogRecPtr	origin_id = XLogRecGetOrigin(buf->record);
+	RepOriginId	origin_id = XLogRecGetOrigin(buf->record);
 	int			i;
 
 	if (parsed->xinfo & XACT_XINFO_HAS_ORIGIN)

Original file line number	Diff line number	Diff line change
`@@ -476,7 +476,7 @@ DecodeCommit(LogicalDecodingContext ctx, XLogRecordBuffer buf,`
`476`	`476`	`{`
`477`	`477`	`XLogRecPtr origin_lsn = InvalidXLogRecPtr;`
`478`	`478`	`TimestampTz commit_time = parsed->xact_time;`
`479`		`- XLogRecPtr origin_id = XLogRecGetOrigin(buf->record);`
	`479`	`+ RepOriginId origin_id = XLogRecGetOrigin(buf->record);`
`480`	`480`	`int i;`
`481`	`481`
`482`	`482`	`if (parsed->xinfo & XACT_XINFO_HAS_ORIGIN)`