Merge "objectcache: make BagOStuff::mergeViaLock() timeout more sensible"

[lhc/web/wiklou.git] / includes / installer / MysqlUpdater.php

diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php
index b52cfb1..99d6b35 100644 (file)
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -197,7 +197,6 @@ class MysqlUpdater extends DatabaseUpdater {
                        [ 'addTable', 'user_former_groups', 'patch-user_former_groups.sql' ],
 
                        // 1.19
-                       [ 'addIndex', 'logging', 'type_action', 'patch-logging-type-action-index.sql' ],
                        [ 'addField', 'revision', 'rev_sha1', 'patch-rev_sha1.sql' ],
                        [ 'doMigrateUserOptions' ],
                        [ 'dropField', 'user', 'user_options', 'patch-drop-user_options.sql' ],
@@ -359,6 +358,15 @@ class MysqlUpdater extends DatabaseUpdater {
                        [ 'addField', 'change_tag', 'ct_tag_id', 'patch-change_tag-tag_id.sql' ],
                        [ 'addIndex', 'archive', 'ar_revid_uniq', 'patch-archive-ar_rev_id-unique.sql' ],
                        [ 'populateContentTables' ],
+                       [ 'addIndex', 'logging', 'log_type_action', 'patch-logging-log-type-action-index.sql' ],
+                       [ 'dropIndex', 'logging', 'type_action', 'patch-logging-drop-type-action-index.sql' ],
+                       [ 'renameIndex', 'interwiki', 'iw_prefix', 'PRIMARY', false, 'patch-interwiki-fix-pk.sql' ],
+                       [ 'renameIndex', 'page_props', 'pp_page_propname', 'PRIMARY', false,
+                               'patch-page_props-fix-pk.sql' ],
+                       [ 'renameIndex', 'protected_titles', 'pt_namespace_title', 'PRIMARY', false,
+                               'patch-protected_titles-fix-pk.sql' ],
+                       [ 'renameIndex', 'site_identifiers', 'site_ids_type', 'PRIMARY', false,
+                               'patch-site_identifiers-fix-pk.sql' ],
                ];
        }
 
@@ -1223,7 +1231,7 @@ class MysqlUpdater extends DatabaseUpdater {
                                'Extending edit summary lengths (and setting defaults)'
                        );
                } else {
-                       $this->output( '...comment fields are up to date' );
+                       $this->output( "...comment fields are up to date.\n" );
                }
        }