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
Merge "Don't pass USE INDEX to a $dbType parameter" into REL1_31
[lhc/web/wiklou.git]
/
includes
/
libs
/
rdbms
/
database
/
DBConnRef.php
diff --git
a/includes/libs/rdbms/database/DBConnRef.php
b/includes/libs/rdbms/database/DBConnRef.php
index
11ce957
..
c94f62f
100644
(file)
--- a/
includes/libs/rdbms/database/DBConnRef.php
+++ b/
includes/libs/rdbms/database/DBConnRef.php
@@
-505,11
+505,13
@@
class DBConnRef implements IDatabase {
return $this->__call( __FUNCTION__, func_get_args() );
}
return $this->__call( __FUNCTION__, func_get_args() );
}
- public function cancelAtomic( $fname = __METHOD__ ) {
+ public function cancelAtomic( $fname = __METHOD__
, AtomicSectionIdentifier $sectionId = null
) {
return $this->__call( __FUNCTION__, func_get_args() );
}
return $this->__call( __FUNCTION__, func_get_args() );
}
- public function doAtomicSection( $fname, callable $callback ) {
+ public function doAtomicSection(
+ $fname, callable $callback, $cancelable = self::ATOMIC_NOT_CANCELABLE
+ ) {
return $this->__call( __FUNCTION__, func_get_args() );
}
return $this->__call( __FUNCTION__, func_get_args() );
}