From: Liam Edwards-Playne <liamzebedee@yahoo.com.au>
Date: Wed, 13 Mar 2013 10:25:59 +0000 (+1000)
Subject: Filtered "LOCK IN SHARE MODE" from SQLite
X-Git-Tag: 1.31.0-rc.0~20354^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmembres/Category:Foo?a=commitdiff_plain;h=2750f8382f3ab6631d289cfe6851f151a754bcfb;p=lhc%2Fweb%2Fwiklou.git

Filtered "LOCK IN SHARE MODE" from SQLite

"LOCK IN SHARE MODE" is a MySQL extension not supported
by SQLite.

Bug: 45650
Change-Id: I74af28e3f7bb0c37ea1cc9cd087a688ba7621e57
---

diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php
index 24346502ec..0789e1b111 100644
--- a/includes/db/DatabaseSqlite.php
+++ b/includes/db/DatabaseSqlite.php
@@ -471,7 +471,7 @@ class DatabaseSqlite extends DatabaseBase {
 	 */
 	function makeSelectOptions( $options ) {
 		foreach ( $options as $k => $v ) {
-			if ( is_numeric( $k ) && $v == 'FOR UPDATE' ) {
+			if ( is_numeric( $k ) && ($v == 'FOR UPDATE' || $v == 'LOCK IN SHARE MODE') ) {
 				$options[$k] = '';
 			}
 		}