jenkins-bot has submitted this change and it was merged.

Change subject: Revert "Declare visibility for class properties in 
MySQLMasterPos"
......................................................................


Revert "Declare visibility for class properties in MySQLMasterPos"

These members are accessed from DatabaseMysqlBase::masterPosWait and
DatabaseBase::masterPosWait, causing errors if the wiki has slave
databases or has fakeSlaveLag set.

This reverts commit d0325927d4a7352590e52690aa30ce63fffb6ab8.

Change-Id: I563bde457274dad2f254145426376b275b597e2a
---
M includes/db/DatabaseMysqlBase.php
1 file changed, 1 insertion(+), 5 deletions(-)

Approvals:
  Aaron Schulz: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/db/DatabaseMysqlBase.php 
b/includes/db/DatabaseMysqlBase.php
index 3ac7442..3125325 100644
--- a/includes/db/DatabaseMysqlBase.php
+++ b/includes/db/DatabaseMysqlBase.php
@@ -1203,11 +1203,7 @@
 }
 
 class MySQLMasterPos implements DBMasterPos {
-       /** @var string */
-       private $file;
-
-       /** @var int */
-       private $pos;
+       var $file, $pos;
 
        function __construct( $file, $pos ) {
                $this->file = $file;

-- 
To view, visit https://gerrit.wikimedia.org/r/105214
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I563bde457274dad2f254145426376b275b597e2a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to