From 4754b82f103754876d80a805c9cd0deeebb69f24 Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Sat, 16 Oct 2010 14:34:37 +0200 Subject: Minor improvement for bug 451735 r=mkanat --- Bugzilla/DB.pm | 2 -- Bugzilla/DB/Mysql.pm | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Bugzilla/DB.pm b/Bugzilla/DB.pm index 0290623d2..97099b54c 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 6fd75b79f..cdc23287d 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)) { -- cgit v1.2.3-24-g4f1b