Merge branch 'PGPROEE9_6' of gitlab.postgrespro.ru:pgpro-dev/postgrespro into PGPROEE9_6

vbwagner · vbwagner · commit 743412775290 · 2017-01-23T16:22:36.000+03:00
diff --git a/src/backend/storage/lmgr/lwlock.c b/src/backend/storage/lmgr/lwlock.c
@@ -890,6 +890,8 @@ LWLockAttemptLock(LWLock *lock, LWLockMode mode)
 	pg_unreachable();
 }
 
+#endif
+
 /*
  * Lock the LWLock's wait list against concurrent activity.
  *
@@ -960,8 +962,6 @@ LWLockWaitListUnlock(LWLock *lock)
 	Assert(old_state & LW_FLAG_LOCKED);
 }
 
-#endif
-
 /*
  * Wakeup all the lockers that currently have a chance to acquire the lock.
  */

Original file line number	Diff line number	Diff line change
`@@ -890,6 +890,8 @@ LWLockAttemptLock(LWLock *lock, LWLockMode mode)`
`890`	`890`	`pg_unreachable();`
`891`	`891`	`}`
`892`	`892`
	`893`	`+#endif`
	`894`	`+`
`893`	`895`	`/*`
`894`	`896`	`* Lock the LWLock's wait list against concurrent activity.`
`895`	`897`	`*`
`@@ -960,8 +962,6 @@ LWLockWaitListUnlock(LWLock *lock)`
`960`	`962`	`Assert(old_state & LW_FLAG_LOCKED);`
`961`	`963`	`}`
`962`	`964`
`963`		`-#endif`
`964`		`-`
`965`	`965`	`/*`
`966`	`966`	`* Wakeup all the lockers that currently have a chance to acquire the lock.`
`967`	`967`	`*/`