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
rdbms: fix bogus $fname parameter in LoadMonitorMySQL
[lhc/web/wiklou.git]
/
includes
/
libs
/
rdbms
/
loadmonitor
/
LoadMonitorMySQL.php
diff --git
a/includes/libs/rdbms/loadmonitor/LoadMonitorMySQL.php
b/includes/libs/rdbms/loadmonitor/LoadMonitorMySQL.php
index
f8ad329
..
1fbc117
100644
(file)
--- a/
includes/libs/rdbms/loadmonitor/LoadMonitorMySQL.php
+++ b/
includes/libs/rdbms/loadmonitor/LoadMonitorMySQL.php
@@
-46,12
+46,12
@@
class LoadMonitorMySQL extends LoadMonitor {
protected function getWeightScale( $index, IDatabase $conn = null ) {
if ( !$conn ) {
protected function getWeightScale( $index, IDatabase $conn = null ) {
if ( !$conn ) {
- return
0.0
;
+ return
parent::getWeightScale( $index, $conn )
;
}
$weight = 1.0;
if ( $this->warmCacheRatio > 0 ) {
}
$weight = 1.0;
if ( $this->warmCacheRatio > 0 ) {
- $res = $conn->query( 'SHOW STATUS',
false
);
+ $res = $conn->query( 'SHOW STATUS',
__METHOD__
);
$s = $res ? $conn->fetchObject( $res ) : false;
if ( $s === false ) {
$host = $this->parent->getServerName( $index );
$s = $res ? $conn->fetchObject( $res ) : false;
if ( $s === false ) {
$host = $this->parent->getServerName( $index );