From: jocuri%softhome.net <>
Date: Tue, 14 Dec 2004 09:41:35 +0000 (+0000)
Subject: Patch for bug 244756: checksetup.pl shouldn't fail to remove product index from miles... 
X-Git-Tag: bugzilla-2.18~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54450149e71273516206b4c67152aaa75d647697;p=thirdparty%2Fbugzilla.git

Patch for bug 244756: checksetup.pl shouldn't fail to remove product index from milestones table in upgrade from 2.14.x; patch by Max K-A <mkanat@kerio.com>, r=vladd, a=justdave.
---

diff --git a/checksetup.pl b/checksetup.pl
index 1eaf0618f0..8e09bdfe56 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -3336,6 +3336,15 @@ if (GetFieldDef("products", "product")) {
     }
     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;
+
     $dbh->do("ALTER TABLE milestones ADD UNIQUE (product_id, value)");
     $dbh->do("ALTER TABLE bugs DROP INDEX product");
     $dbh->do("ALTER TABLE bugs ADD INDEX (product_id)");