summaryrefslogtreecommitdiff
path: root/maintenance/updateSearchIndex.inc
diff options
context:
space:
mode:
Diffstat (limited to 'maintenance/updateSearchIndex.inc')
-rw-r--r--maintenance/updateSearchIndex.inc11
1 files changed, 6 insertions, 5 deletions
diff --git a/maintenance/updateSearchIndex.inc b/maintenance/updateSearchIndex.inc
index ed01575c..bf2b8c37 100644
--- a/maintenance/updateSearchIndex.inc
+++ b/maintenance/updateSearchIndex.inc
@@ -1,7 +1,6 @@
<?php
/**
- * @package MediaWiki
- * @subpackage Maintenance
+ * @addtogroup Maintenance
*/
/** */
@@ -14,7 +13,7 @@ function updateSearchIndex( $start, $end, $maxLockTime, $quiet ) {
$wgQuiet = $quiet;
$wgDisableSearchUpdate = false;
- $dbw =& wfGetDB( DB_MASTER );
+ $dbw = wfGetDB( DB_MASTER );
$recentchanges = $dbw->tableName( 'recentchanges' );
output( "Updating searchindex between $start and $end\n" );
@@ -74,7 +73,9 @@ function updateSearchIndex( $start, $end, $maxLockTime, $quiet ) {
# Unlock searchindex
if ( $maxLockTime ) {
+ output( " --- Unlocking --" );
unlockSearchindex( $dbw );
+ output( "\n" );
}
output( "Done\n" );
}
@@ -91,11 +92,11 @@ function lockSearchindex( &$db ) {
$items[] = $db->tableName( $table ) . ' READ';
}
$sql = "LOCK TABLES " . implode( ',', $items );
- $db->query( $sql );
+ $db->query( $sql, 'updateSearchIndex.inc ' . __METHOD__ );
}
function unlockSearchindex( &$db ) {
- $db->query( "UNLOCK TABLES" );
+ $db->query( "UNLOCK TABLES", 'updateSearchIndex.inc ' . __METHOD__ );
}
# Unlock and lock again