| Index: trunk/phase3/maintenance/archives/patch-user_email_index.sql |
| — | — | @@ -0,0 +1 @@ |
| | 2 | + ALTER TABLE /*$wgDBprefix*/user ADD INDEX ( `user_email`, `user_name` ); |
| \ No newline at end of file |
| Property changes on: trunk/phase3/maintenance/archives/patch-user_email_index.sql |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 3 | + native |
| Index: trunk/phase3/includes/installer/MysqlUpdater.php |
| — | — | @@ -163,21 +163,22 @@ |
| 164 | 164 | // 1.17 |
| 165 | 165 | array( 'addTable', 'iwlinks', 'patch-iwlinks.sql' ), |
| 166 | 166 | array( 'addIndex', 'iwlinks', 'iwl_prefix_title_from', 'patch-rename-iwl_prefix.sql' ), |
| 167 | | - array( 'addField', 'updatelog', 'ul_value', 'patch-ul_value.sql' ), |
| | 167 | + array( 'addField', 'updatelog', 'ul_value', 'patch-ul_value.sql' ), |
| 168 | 168 | array( 'addField', 'interwiki', 'iw_api', 'patch-iw_api_and_wikiid.sql' ), |
| 169 | | - array( 'dropIndex', 'iwlinks', 'iwl_prefix', 'patch-kill-iwl_prefix.sql' ), |
| 170 | | - array( 'dropIndex', 'iwlinks', 'iwl_prefix_from_title', 'patch-kill-iwl_pft.sql' ), |
| 171 | | - array( 'addField', 'categorylinks', 'cl_collation', 'patch-categorylinks-better-collation.sql' ), |
| | 169 | + array( 'dropIndex', 'iwlinks', 'iwl_prefix', 'patch-kill-iwl_prefix.sql' ), |
| | 170 | + array( 'dropIndex', 'iwlinks', 'iwl_prefix_from_title', 'patch-kill-iwl_pft.sql' ), |
| | 171 | + array( 'addField', 'categorylinks', 'cl_collation', 'patch-categorylinks-better-collation.sql' ), |
| 172 | 172 | array( 'doClFieldsUpdate' ), |
| 173 | 173 | array( 'doCollationUpdate' ), |
| 174 | 174 | array( 'addTable', 'msg_resource', 'patch-msg_resource.sql' ), |
| 175 | 175 | array( 'addTable', 'module_deps', 'patch-module_deps.sql' ), |
| 176 | | - array( 'dropIndex', 'archive', 'ar_page_revid', 'patch-archive_kill_ar_page_revid.sql' ), |
| 177 | | - array( 'addIndex', 'archive', 'ar_revid', 'patch-archive_ar_revid.sql' ), |
| | 176 | + array( 'dropIndex', 'archive', 'ar_page_revid', 'patch-archive_kill_ar_page_revid.sql' ), |
| | 177 | + array( 'addIndex', 'archive', 'ar_revid', 'patch-archive_ar_revid.sql' ), |
| 178 | 178 | array( 'doLangLinksLengthUpdate' ), |
| 179 | 179 | |
| 180 | 180 | // 1.18 |
| 181 | 181 | array( 'doUserNewTalkTimestampNotNull' ), |
| | 182 | + array( 'addIndex', 'user', 'user_email', 'patch-user_email_index.sql' ), |
| 182 | 183 | ); |
| 183 | 184 | } |
| 184 | 185 | |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -3012,7 +3012,7 @@ |
| 3013 | 3013 | */ |
| 3014 | 3014 | $wgPasswordResetRoutes = array( |
| 3015 | 3015 | 'username' => true, |
| 3016 | | - 'email' => false, // Warning: enabling this will be *very* slow on large wikis |
| | 3016 | + 'email' => false, |
| 3017 | 3017 | ); |
| 3018 | 3018 | |
| 3019 | 3019 | /** |
| Index: trunk/phase3/includes/specials/SpecialPasswordReset.php |
| — | — | @@ -105,8 +105,6 @@ |
| 106 | 106 | && Sanitizer::validateEmail( $data['Email'] ) ) |
| 107 | 107 | { |
| 108 | 108 | $method = 'email'; |
| 109 | | - |
| 110 | | - // FIXME: this is an unindexed query |
| 111 | 109 | $res = wfGetDB( DB_SLAVE )->select( |
| 112 | 110 | 'user', |
| 113 | 111 | '*', |