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

Change subject: Remove pointless rollback() warnings with "flush"
......................................................................


Remove pointless rollback() warnings with "flush"

This would previously make log noise when rollbackMasterChangesAndLog()
is triggered for explicit transactions.

Change-Id: Ia0009bcf575ef346d3bb7354ce3fb6fb477eb95f
---
M includes/db/Database.php
1 file changed, 0 insertions(+), 2 deletions(-)

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



diff --git a/includes/db/Database.php b/includes/db/Database.php
index 6e1b8a9..c58e9bd 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -2689,8 +2689,6 @@
                } else {
                        if ( !$this->mTrxLevel ) {
                                return; // nothing to do
-                       } elseif ( !$this->mTrxAutomatic ) {
-                               wfWarn( "$fname: Flushing an explicit 
transaction, getting out of sync!" );
                        }
                }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0009bcf575ef346d3bb7354ce3fb6fb477eb95f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Chad <[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

Reply via email to