Aaron Schulz has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/312117

Change subject: Make Database::__clone() a bit more robust using 
handleSessionLoss()
......................................................................

Make Database::__clone() a bit more robust using handleSessionLoss()

Change-Id: I6c16abceea612a7b1167b9cca70a174fa6b77020
---
M includes/libs/rdbms/database/Database.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/17/312117/1

diff --git a/includes/libs/rdbms/database/Database.php 
b/includes/libs/rdbms/database/Database.php
index 03a12d7..1006059 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -3544,7 +3544,8 @@
                        // Open a new connection resource without messing with 
the old one
                        $this->mOpened = false;
                        $this->mConn = false;
-                       $this->mTrxLevel = 0; // no trx anymore
+                       $this->mTrxEndCallbacks = []; // don't copy
+                       $this->handleSessionLoss(); // no trx or locks anymore
                        $this->open( $this->mServer, $this->mUser, 
$this->mPassword, $this->mDBname );
                        $this->lastPing = microtime( true );
                }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c16abceea612a7b1167b9cca70a174fa6b77020
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to