Minor improvement for bug 451735

r=mkanat

diff --git a/Bugzilla/DB.pm b/Bugzilla/DB.pm
index 0290623d2e5e21fa279bf5aeb075b3382bfea6d4..97099b54cf3855e38db4032434f66edfcf21afd7 100644 (file)
--- 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 6fd75b79f905da7845357be7c5078deadd278cf6..cdc23287d665c5a3b02fc52a1d760e8cba81a180 100644 (file)
--- 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)) {