From 699ab97fe8f7c63461f565668f888f553be6b5d2 Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org"
 <mkanat%bugzilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 16 Oct 2010 12:51:06 +0000
Subject: [PATCH] Minor improvement for bug 451735 r=mkanat

git-svn-id: svn://10.0.0.236/trunk@261420 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/.bzrrev              | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/DB.pm       | 2 --
 mozilla/webtools/bugzilla/Bugzilla/DB/Mysql.pm | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index b21d07dae2e..e8ea9e2a926 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-7545
\ No newline at end of file
+7546
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/Bugzilla/DB.pm b/mozilla/webtools/bugzilla/Bugzilla/DB.pm
index 0290623d2e5..97099b54cf3 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/DB.pm
+++ b/mozilla/webtools/bugzilla/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/mozilla/webtools/bugzilla/Bugzilla/DB/Mysql.pm b/mozilla/webtools/bugzilla/Bugzilla/DB/Mysql.pm
index 6fd75b79f90..cdc23287d66 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/DB/Mysql.pm
+++ b/mozilla/webtools/bugzilla/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)) {