Merge branch 'PGPRO9_5' into PGPRO9_5_pg_query_state

Maksim Milyutin · Maksim Milyutin · commit a008803eae94 · 2016-09-09T13:48:43.000+03:00
diff --git a/src/backend/access/heap/ptrack.c b/src/backend/access/heap/ptrack.c
@@ -385,7 +385,7 @@ SetPtrackClearLSN(bool set_invalid)
 		ereport(PANIC,
 				(errcode_for_file_access(),
 				 errmsg("could not close ptrack control file: %m")));
-	//LWLockRelease(ControlFileLock);
+	/* LWLockRelease(ControlFileLock); */
 }
 
 /* Test ptrack file */

Original file line number	Diff line number	Diff line change
`@@ -385,7 +385,7 @@ SetPtrackClearLSN(bool set_invalid)`
`385`	`385`	`ereport(PANIC,`
`386`	`386`	`(errcode_for_file_access(),`
`387`	`387`	`errmsg("could not close ptrack control file: %m")));`
`388`		`- //LWLockRelease(ControlFileLock);`
	`388`	`+ /* LWLockRelease(ControlFileLock); */`
`389`	`389`	`}`
`390`	`390`
`391`	`391`	`/* Test ptrack file */`