diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2010-03-09 07:35:26 +0100 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2010-03-09 07:35:26 +0100 |
| commit | 68d8f40ee713b12fefce5dfb93f6843717ccc951 (patch) | |
| tree | 2e2dd99da303081975560021fde9880efee64ee3 /maintenance/updaters.inc | |
| parent | 41f758f4ba17efde372e3cd18eee6f45519b41e2 (diff) | |
| parent | 6f5403ca6e8561c3dcd19284f86b4c3c8dd715ff (diff) | |
Merge branch 'master' into redesign
Diffstat (limited to 'maintenance/updaters.inc')
| -rw-r--r-- | maintenance/updaters.inc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc index edef1fdc..81c54cc5 100644 --- a/maintenance/updaters.inc +++ b/maintenance/updaters.inc @@ -1221,7 +1221,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; } @@ -1813,8 +1814,8 @@ function do_postgres_updates() { 'ctype' => 'U', 'mw_version' => $wgVersion, 'pg_version' => $version, - 'sql_version' => '$LastChangedRevision: 51640 $', - 'sql_date' => '$LastChangedDate: 2009-06-09 22:58:05 +1000 (Tue, 09 Jun 2009) $', + 'sql_version' => '$LastChangedRevision: 60080 $', + 'sql_date' => '$LastChangedDate: 2009-12-15 09:24:12 -0800 (Tue, 15 Dec 2009) $', ) ); return; } |