Improve mismatched atomic section errors
authorAaron Schulz <aschulz@wikimedia.org>
Fri, 6 Nov 2015 00:23:21 +0000 (16:23 -0800)
committerAaron Schulz <aschulz@wikimedia.org>
Fri, 6 Nov 2015 00:35:22 +0000 (16:35 -0800)
Change-Id: I9b1561b6426ac00f72867452bee396b649ad8bfd

includes/db/Database.php

index 531086b..60cf0ec 100644 (file)
@@ -3438,7 +3438,7 @@ abstract class DatabaseBase implements IDatabase {
                                $levels = implode( ', ', $this->mTrxAtomicLevels );
                                throw new DBUnexpectedError(
                                        $this,
-                                       "Got explicit BEGIN while atomic sections $levels are still open."
+                                       "Got explicit BEGIN from $fname while atomic section(s) $levels are open."
                                );
                        } elseif ( !$this->mTrxAutomatic ) {
                                // We want to warn about inadvertently nested begin/commit pairs, but not about