From: Aaron <aschulz@wikimedia.org>
Date: Fri, 21 Sep 2012 22:27:10 +0000 (-0700)
Subject: Don't send COMMIT if not in a transaction.
X-Git-Tag: 1.31.0-rc.0~22314^2
X-Git-Url: http://git.cyclocoop.org//%22javascript:ModifierStyle%28%27%22.%24id.%22%27%29/%22?a=commitdiff_plain;h=522820ccaa06aceefd85ee391a75b35df0a29067;p=lhc%2Fweb%2Fwiklou.git

Don't send COMMIT if not in a transaction.

Change-Id: Ifffbf703b15cd875feda1514d3c0d488b8665b66
---

diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php
index df36bf8f2d..d635645723 100644
--- a/includes/db/LoadBalancer.php
+++ b/includes/db/LoadBalancer.php
@@ -921,7 +921,7 @@ class LoadBalancer {
 				continue;
 			}
 			foreach ( $conns2[$masterIndex] as $conn ) {
-				if ( $conn->doneWrites() ) {
+				if ( $conn->trxLevel() && $conn->doneWrites() ) {
 					$conn->commit( __METHOD__ );
 				}
 			}