Backing out bug 286625 - checksetup.pl fails

diff --git a/Bugzilla/DB/Schema.pm b/Bugzilla/DB/Schema.pm
index 610ba4c99f1a6b543c33a3ec35ade0c77ee98bd4..801f353d74019c5f51af3b29868a119b92ef32fc 100644 (file)
--- a/Bugzilla/DB/Schema.pm
+++ b/Bugzilla/DB/Schema.pm
@@ -224,17 +224,10 @@ use constant ABSTRACT_SCHEMA => {
             removed   => {TYPE => 'TINYTEXT'},
         ],
         INDEXES => [
-            bugs_activity_bugid_idx          => ['bug_id'],
-            bugs_activity_who_idx            => ['who'],
-            bugs_activity_bugwhen_idx        => ['bug_when'],
-            bugs_activity_fieldid_idx        => ['fieldid'],
-            bugs_activity_bug_field_idx      => [qw(bug_id fieldid)],
-            bugs_activity_added_idx          => {FIELDS => ['added'],
-                                                 TYPE => 'FULLTEXT'},
-            bugs_activity_removed_idx        => {FIELDS => ['removed'],
-                                                 TYPE => 'FULLTEXT'},
-            bugs_activity_added_removed_idx  => {FIELDS => [qw(added removed)],
-                                                 TYPE => 'FULLTEXT'},
+            bugs_activity_bugid_idx   => ['bug_id'],
+            bugs_activity_who_idx     => ['who'],
+            bugs_activity_bugwhen_idx => ['bug_when'],
+            bugs_activity_fieldid_idx => ['fieldid'],
         ],
     },
 

diff --git a/checksetup.pl b/checksetup.pl
index 7533b8dd8a5491c82f43007872ab3e295ecbec38..07367f0c341c7723028f087d8d70de1f6b89789c 100755 (executable)
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -3868,14 +3868,6 @@ if (!$dbh->bz_get_field_def('bugs', 'qa_contact')->[2]) { # if it's NOT NULL
                WHERE initialqacontact = 0");
 }
 
-# 2005-03-17 Add more indices for bugs_activity -- Bug 286625
-print "Adding more indexes for bugs_activity table.\n";
-$dbh->do("ALTER TABLE bugs_activity ADD INDEX bugs_activity_idfield (bug_id, fieldid)");
-$dbh->do("ALTER TABLE bugs_activity ADD FULLTEXT bugs_activity_added (added)");
-$dbh->do("ALTER TABLE bugs_activity ADD FULLTEXT bugs_activity_removed (removed)");
-$dbh->do("ALTER TABLE bugs_activity ADD FULLTEXT bugs_activity_added_removed (added, removed)");
-
-
 } # END LEGACY CHECKS