(bug 20880) Fixed updater failure on SQLite backend

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6fefee4..ff9dd16 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -564,6 +564,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 21079) There is no more line wrapping between label and field in Special:Log
 * (bug 20256) Fixed SQL errors on Special:Recentchanges and Special:Recentchangeslinked
   on SQLite backend
+* (bug 20880) Fixed updater failure on SQLite backend
 
 == API changes in 1.16 ==
 

diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc
index a1595e4..5803737 100644 (file)
--- a/maintenance/updaters.inc
+++ b/maintenance/updaters.inc
@@ -1267,7 +1267,8 @@ function do_populate_parent_id() {
 
 function sqlite_initial_indexes() {
        global $wgDatabase;
-       if ( update_row_exists( 'initial_indexes' ) ) {
+       // initial-indexes.sql fails if the indexes are already present, so we perform a quick check if our database is newer.
+       if ( update_row_exists( 'initial_indexes' ) || $wgDatabase->indexExists( 'user', 'user_name' ) ) {
                wfOut( "...have initial indexes\n" );
                return;
        }