dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LoadBalancerTest: Clean up transaction handling for sqlite
[lhc/web/wiklou.git]
/
includes
/
libs
/
rdbms
/
database
/
Database.php
diff --git
a/includes/libs/rdbms/database/Database.php
b/includes/libs/rdbms/database/Database.php
index
f681795
..
1779880
100644
(file)
--- a/
includes/libs/rdbms/database/Database.php
+++ b/
includes/libs/rdbms/database/Database.php
@@
-1181,8
+1181,7
@@
abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
} else {
# Nothing prior was there to lose from the transaction,
# so just roll it back.
} else {
# Nothing prior was there to lose from the transaction,
# so just roll it back.
- $this->doRollback( __METHOD__ . " ($fname)" );
- $this->trxStatus = self::STATUS_TRX_OK;
+ $this->rollback( __METHOD__ . " ($fname)", self::FLUSHING_INTERNAL );
}
$this->trxStatusIgnoredCause = null;
} else {
}
$this->trxStatusIgnoredCause = null;
} else {