Merge "(bug 39635) PostgreSQL has no LOCK IN SHARE MODE"

diff --combined RELEASE-NOTES-1.20
index e06dc7d,de0456c..1791d4d
--- 1/RELEASE-NOTES-1.20
--- 2/RELEASE-NOTES-1.20
+++ b/RELEASE-NOTES-1.20
@@@ -260,6 -260,7 +260,7 @@@ upgrade PHP if you have not done so pri
  * (bug 38904) prop=revisions&rvstart=... no longer blows up when continuing.
  * (bug 39032) ApiQuery generates help in constructor.
  * (bug 11142) Improve file extension blacklist error reporting in API upload
+ * (bug 39635) PostgreSQL LOCK IN SHARE MODE option is a syntax error
  
  === Languages updated in 1.20 ===
  
@@@ -293,7 -294,6 +294,7 @@@ changes to languages because of Bugzill
  * Deprecated mw.user.anonymous in favour of mw.user.isAnon.
  * Deprecated DatabaseBase functions newFromParams(), newFromType(), set(),
    quote_ident(), and escapeLike() were removed.
 +* Use of __DIR__ instead of dirname( __FILE__ ).
  
  == Compatibility ==