From: Frédéric Buclin <LpSolit@gmail.com>
Date: Sat, 16 Oct 2010 12:34:37 +0000 (+0200)
Subject: Minor improvement for bug 451735
X-Git-Tag: bugzilla-4.1.1~207
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4754b82f103754876d80a805c9cd0deeebb69f24;p=thirdparty%2Fbugzilla.git

Minor improvement for bug 451735
r=mkanat
---

diff --git a/Bugzilla/DB.pm b/Bugzilla/DB.pm
index 0290623d2e..97099b54cf 100644
--- a/Bugzilla/DB.pm
+++ b/Bugzilla/DB.pm
@@ -941,8 +941,6 @@ sub bz_drop_index {
         $self->_bz_real_schema->delete_index($table, $name);
         $self->_bz_store_real_schema;        
     }
-
-    return $index_exists ? 1 : 0;
 }
 
 # bz_drop_index_raw($table, $name, $silent)
diff --git a/Bugzilla/DB/Mysql.pm b/Bugzilla/DB/Mysql.pm
index 6fd75b79f9..cdc23287d6 100644
--- a/Bugzilla/DB/Mysql.pm
+++ b/Bugzilla/DB/Mysql.pm
@@ -772,7 +772,7 @@ sub bz_setup_database {
     # despite it was still present in the DB. That's why we have to
     # force the deletion, bypassing the DB schema.
     if (!$self->bz_index_info('series', 'series_category_idx')) {
-        if (!$self->bz_drop_index('series', 'series_creator_idx')
+        if (!$self->bz_index_info('series', 'series_creator_idx')
             && $self->bz_index_info_real('series', 'series_creator_idx'))
         {
             foreach my $column (qw(creator category subcategory name)) {