[Pkg-mediawiki-commits] r426 - in mediawiki/trunk/debian: . patches

[Thorsten Glaser]

Author: tg
Date: 2013-02-11 08:46:03 +0000 (Mon, 11 Feb 2013)
New Revision: 426

Added:
   mediawiki/trunk/debian/patches/bz39635.patch
Modified:
   mediawiki/trunk/debian/changelog
   mediawiki/trunk/debian/patches/series
Log:
Upstream patch to fix another MySQLism (BZ#39635)


Modified: mediawiki/trunk/debian/changelog
===================================================================
--- mediawiki/trunk/debian/changelog	2013-02-11 08:44:30 UTC (rev 425)
+++ mediawiki/trunk/debian/changelog	2013-02-11 08:46:03 UTC (rev 426)
@@ -2,8 +2,9 @@
 
   * Add missing changelog entries to 1:1.19.3-1 upload (oops…)
   * Upstream patch to fix XHTML issue in Special:Upload (BZ#40889)
+  * Upstream patch to fix another MySQLism (BZ#39635)
 
- -- Thorsten Glaser <t.glaser at tarent.de>  Mon, 17 Dec 2012 15:38:30 +0100
+ -- Thorsten Glaser <tg at mirbsd.de>  Mon, 11 Feb 2013 09:45:19 +0100
 
 mediawiki (1:1.19.3-1) unstable; urgency=high
 

Added: mediawiki/trunk/debian/patches/bz39635.patch
===================================================================
--- mediawiki/trunk/debian/patches/bz39635.patch	                        (rev 0)
+++ mediawiki/trunk/debian/patches/bz39635.patch	2013-02-11 08:46:03 UTC (rev 426)
@@ -0,0 +1,30 @@
+From 5fe67c61a777c9a97aacdf835cd067c754054454 Mon Sep 17 00:00:00 2001
+From: saper <saper at saper.info>
+Date: Mon, 27 Aug 2012 18:58:54 +0200
+Subject: [PATCH] (bug 39635) PostgreSQL has no LOCK IN SHARE MODE
+
+includes/Category.php tells us to use "SELECT ...
+LOCK IN SHARE MODE" before "UPDATE".
+
+This is MySQL-only construct:
+
+http://dev.mysql.com/doc/refman/5.0/en/innodb-locking-reads.html
+
+Change-Id: I80709da9e15c891f1605900e7c527d5042a88f73
+---
+ RELEASE-NOTES-1.20               |    1 +
+ includes/db/DatabasePostgres.php |    3 ---
+ 2 files changed, 1 insertions(+), 3 deletions(-)
+
+--- a/includes/db/DatabasePostgres.php
++++ b/includes/db/DatabasePostgres.php
+@@ -979,9 +979,6 @@ SQL;
+ 		if ( isset( $noKeyOptions['FOR UPDATE'] ) ) {
+ 			$postLimitTail .= ' FOR UPDATE';
+ 		}
+-		if ( isset( $noKeyOptions['LOCK IN SHARE MODE'] ) ) {
+-			$postLimitTail .= ' LOCK IN SHARE MODE';
+-		}
+ 		if ( isset( $noKeyOptions['DISTINCT'] ) || isset( $noKeyOptions['DISTINCTROW'] ) ) {
+ 			$startOpts .= 'DISTINCT';
+ 		}

Modified: mediawiki/trunk/debian/patches/series
===================================================================
--- mediawiki/trunk/debian/patches/series	2013-02-11 08:44:30 UTC (rev 425)
+++ mediawiki/trunk/debian/patches/series	2013-02-11 08:46:03 UTC (rev 426)
@@ -5,3 +5,4 @@
 fix_warnings.patch
 bz29635.patch
 bz40889.patch
+bz39635.patch