From: mkanat%bugzilla.org <>
Date: Thu, 25 Jan 2007 23:45:38 +0000 (+0000)
Subject: Bug 368147: Upgrade from 2.16 and earlier does not work with DBD::mysql 4.0
X-Git-Tag: bugzilla-2.22.2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9034c66fad4307cdeb4da5a4abba1a11987ab2c;p=thirdparty%2Fbugzilla.git

Bug 368147: Upgrade from 2.16 and earlier does not work with DBD::mysql 4.0
Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit, a=mkanat
---

diff --git a/checksetup.pl b/checksetup.pl
index 21c37e4c74..50e67fc7f8 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -3023,7 +3023,8 @@ if ($dbh->bz_column_info("profiles", "groupset")) {
     # so all unique keys are removed first and then added back in
     $dbh->bz_drop_index('groups', 'groups_bit_idx');
     $dbh->bz_drop_index('groups', 'groups_name_idx');
-    if ($dbh->primary_key(undef, undef, 'groups')) {
+    my @primary_key = $dbh->primary_key(undef, undef, 'groups');
+    if (@primary_key) {
         $dbh->do("ALTER TABLE groups DROP PRIMARY KEY");
     }