From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 8 Aug 2016 19:36:18 +0000 (-0700)
Subject: Add missing addQuotes() call to masterPosWait()
X-Git-Tag: 1.31.0-rc.0~6127^2
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=e543a0d47fef6c07343a20a804dfb3f6d32120c7;p=lhc%2Fweb%2Fwiklou.git

Add missing addQuotes() call to masterPosWait()

Change-Id: Ic7f35920fe10d99b63fdff23dc6e3f7cd4c7ca8b
---

diff --git a/includes/db/DatabaseMysqlBase.php b/includes/db/DatabaseMysqlBase.php
index a6f8c311ee..ee84224eaa 100644
--- a/includes/db/DatabaseMysqlBase.php
+++ b/includes/db/DatabaseMysqlBase.php
@@ -798,7 +798,7 @@ abstract class DatabaseMysqlBase extends Database {
 		// Call doQuery() directly, to avoid opening a transaction if DBO_TRX is set
 		if ( $this->useGTIDs && $pos->gtids ) {
 			// Wait on the GTID set (MariaDB only)
-			$gtidArg = implode( ',', $pos->gtids );
+			$gtidArg = $this->addQuotes( implode( ',', $pos->gtids ) );
 			$res = $this->doQuery( "SELECT MASTER_GTID_WAIT($gtidArg, $timeout)" );
 		} else {
 			// Wait on the binlog coordinates