Patch for bug 277303: checksetup.pl shouldn't emit a syntax error when trying to fix indexes on the milestones table; patch by Max K-A <mkanat@kerio.com>, r=wurblzap, a=justdave.

1 files changed, 2 insertions, 9 deletions

diff --git a/checksetup.pl b/checksetup.pl
index 7e77af97f..f9e93835e 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -3443,15 +3443,8 @@ if (GetFieldDef("products", "product")) {
                  " AND product_id = $product_id");
     }
     print "Fixing Indexes and Uniqueness.\n";
-    $dbh->do("ALTER TABLE milestones DROP INDEX product");
-
-    # mkanat@kerio.com - bug 244756
-    # Silently drop the PRIMARY key if a buggy mysqldump has put it there.
-    # Don't print any error messages if the index isn't there.
-    my $originalprintwarn = $dbh->{'PrintWarn'};
-    $dbh->{'PrintWarn'} = 0;
-    $dbh->do("ALTER TABLE milestones DROP INDEX PRIMARY");
-    $dbh->{'PrintWarn'} = $originalprintwarn;
+    # Drop any indexes that may exist on the milestones table.
+    DropIndexes('milestones');
 
     $dbh->do("ALTER TABLE milestones ADD UNIQUE (product_id, value)");
     $dbh->do("ALTER TABLE bugs DROP INDEX product");