From 54e63c6abc299f0c718df164670d414cbd23ac6e Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Tue, 10 Jan 2012 18:05:36 +0000
Subject: [PATCH] Reverted r108502, r108504 per CR

---
 includes/installer/MysqlUpdater.php           | 50 -------------------
 .../archives/patch-drop_old_text_fields.sql   |  8 ---
 .../archives/patch-drop_old_text_indexes.sql  |  5 --
 3 files changed, 63 deletions(-)
 delete mode 100644 maintenance/archives/patch-drop_old_text_fields.sql
 delete mode 100644 maintenance/archives/patch-drop_old_text_indexes.sql

diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php
index d77940eb40..a5ffea4e24 100644
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -192,8 +192,6 @@ class MysqlUpdater extends DatabaseUpdater {
 			array( 'modifyField', 'user', 'ug_group', 'patch-ug_group-length-increase.sql' ),
 			array( 'addField',	'uploadstash',	'us_chunk_inx',		'patch-uploadstash_chunk.sql' ),
 			array( 'addfield', 'job',           'job_timestamp',    'patch-jobs-add-timestamp.sql' ),
-			array( 'dropAncientTables' ),
-			array( 'cleanupTextTable' ),
 		);
 	}
 
@@ -855,52 +853,4 @@ class MysqlUpdater extends DatabaseUpdater {
 		$this->applyPatch( 'patch-user-newtalk-timestamp-null.sql' );
 		$this->output( "done.\n" );
 	}
-
-	protected function dropAncientTables() {
-		$ancientTables = array(
-			'blobs', // 1.4
-			'brokenlinks', // 1.4
-			'cur', // 1.4
-			'ip_blocks_old', // Temporary in 1.6
-			'links', // 1.4
-			'linkscc', // 1.4
-			'old', // 1.4
-			'oldwatchlist', // pre 1.1?
-			'trackback', // 1.19
-			'user_rights', // 1.5
-			'validate', // 1.6
-		);
-
-		foreach( $ancientTables as $table ) {
-			if ( $this->db->tableExists( $table, __METHOD__ ) ) {
-				$this->db->dropTable( $table, __METHOD__ );
-			}
-		}
-	}
-
-	protected function cleanupTextTable() {
-		$this->output( "Cleaning up text table\n" );
-
-		/*$oldIndexes = array(
-			'old_namespace',
-			'old_timestamp',
-			'name_title_timestamp',
-			'user_timestamp',
-			'usertext_timestamp',
-		);*/
-		$this->dropIndex( 'text', 'old_namespace', 'patch-drop_old_text_indexes.sql' );
-
-		/*$oldFields = array(
-			'old_namespace',
-			'old_title',
-			'old_comment',
-			'old_user',
-			'old_user_text',
-			'old_timestamp',
-			'old_minor_edit',
-			'inverse_timestamp',
-		);*/
-		$this->dropField( 'text', 'old_namespace', 'patch-drop_old_text_fields.sql' );
-	}
-
 }
diff --git a/maintenance/archives/patch-drop_old_text_fields.sql b/maintenance/archives/patch-drop_old_text_fields.sql
deleted file mode 100644
index 9fe6394b18..0000000000
--- a/maintenance/archives/patch-drop_old_text_fields.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-ALTER TABLE /*_*/text DROP COLUMN old_namespace;
-ALTER TABLE /*_*/text DROP COLUMN old_title;
-ALTER TABLE /*_*/text DROP COLUMN old_comment;
-ALTER TABLE /*_*/text DROP COLUMN old_user;
-ALTER TABLE /*_*/text DROP COLUMN old_user_text;
-ALTER TABLE /*_*/text DROP COLUMN old_timestamp;
-ALTER TABLE /*_*/text DROP COLUMN old_minor_edit;
-ALTER TABLE /*_*/text DROP COLUMN inverse_timestamp;
\ No newline at end of file
diff --git a/maintenance/archives/patch-drop_old_text_indexes.sql b/maintenance/archives/patch-drop_old_text_indexes.sql
deleted file mode 100644
index a35839922c..0000000000
--- a/maintenance/archives/patch-drop_old_text_indexes.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-DROP INDEX old_namespace ON /*_*/text;
-DROP INDEX old_timestamp ON /*_*/text;
-DROP INDEX name_title_timestamp ON /*_*/text;
-DROP INDEX user_timestamp ON /*_*/text;
-DROP INDEX usertext_timestamp ON /*_*/text;
\ No newline at end of file
-- 
2.20.1