Merge branch 'PGPRO9_5_ptrack' into PGPRO9_5

dmpgpro · dmpgpro · commit 2e3d7fc5db21 · 2016-07-13T14:30:39.000+03:00
diff --git a/src/backend/access/heap/ptrack.c b/src/backend/access/heap/ptrack.c
@@ -284,7 +284,7 @@ ptrack_get_and_clear(Oid tablespace_oid, Oid table_oid)
 		elog(WARNING, "InvalidOid");
 		goto full_end;
 	}
-	
+
 	rel = RelationIdGetRelation(RelidByRelfilenode(tablespace_oid, table_oid));
 
 	if (rel == InvalidRelation)
diff --git a/src/include/access/xlog_fn.h b/src/include/access/xlog_fn.h
@@ -16,6 +16,7 @@
 extern Datum pg_start_backup(PG_FUNCTION_ARGS);
 extern Datum pg_stop_backup(PG_FUNCTION_ARGS);
 extern Datum pg_ptrack_clear(PG_FUNCTION_ARGS);
+extern Datum pg_ptrack_get_and_clear(PG_FUNCTION_ARGS);
 extern Datum pg_switch_xlog(PG_FUNCTION_ARGS);
 extern Datum pg_create_restore_point(PG_FUNCTION_ARGS);
 extern Datum pg_current_xlog_location(PG_FUNCTION_ARGS);

Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ ptrack_get_and_clear(Oid tablespace_oid, Oid table_oid)`
`284`	`284`	`elog(WARNING, "InvalidOid");`
`285`	`285`	`goto full_end;`
`286`	`286`	`}`
`287`		`-`
	`287`	`+`
`288`	`288`	`rel = RelationIdGetRelation(RelidByRelfilenode(tablespace_oid, table_oid));`
`289`	`289`
`290`	`290`	`if (rel == InvalidRelation)`