dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2a6d5b5
)
Improve mismatched atomic section errors
author
Aaron Schulz
<aschulz@wikimedia.org>
Fri, 6 Nov 2015 00:23:21 +0000
(16:23 -0800)
committer
Aaron Schulz
<aschulz@wikimedia.org>
Fri, 6 Nov 2015 00:35:22 +0000
(16:35 -0800)
Change-Id: I9b1561b6426ac00f72867452bee396b649ad8bfd
includes/db/Database.php
patch
|
blob
|
history
diff --git
a/includes/db/Database.php
b/includes/db/Database.php
index
531086b
..
60cf0ec
100644
(file)
--- a/
includes/db/Database.php
+++ b/
includes/db/Database.php
@@
-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