jenkins-bot has submitted this change and it was merged.
Change subject: Add missing addQuotes() call to masterPosWait()
......................................................................
Add missing addQuotes() call to masterPosWait()
Change-Id: Ic7f35920fe10d99b63fdff23dc6e3f7cd4c7ca8b
---
M includes/db/DatabaseMysqlBase.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/db/DatabaseMysqlBase.php
b/includes/db/DatabaseMysqlBase.php
index a6f8c31..ee84224 100644
--- a/includes/db/DatabaseMysqlBase.php
+++ b/includes/db/DatabaseMysqlBase.php
@@ -798,7 +798,7 @@
// 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
--
To view, visit https://gerrit.wikimedia.org/r/303613
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic7f35920fe10d99b63fdff23dc6e3f7cd4c7ca8b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.28.0-wmf.13
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Parent5446 <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits