From: mkanat%bugzilla.org <>
Date: Tue, 25 Mar 2008 23:43:20 +0000 (+0000)
Subject: Upgrades from 2.08 were failing because we tried to do bz_index_info_real on the... 
X-Git-Tag: bugzilla-3.1.3~266
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c41867dba879502b744fce9a588c3bdc284961d;p=thirdparty%2Fbugzilla.git

Upgrades from 2.08 were failing because we tried to do bz_index_info_real on the longdescs table, which didn't exist.
---

diff --git a/Bugzilla/DB/Mysql.pm b/Bugzilla/DB/Mysql.pm
index f5e2c9becc..8bca06f4c8 100644
--- a/Bugzilla/DB/Mysql.pm
+++ b/Bugzilla/DB/Mysql.pm
@@ -258,7 +258,7 @@ EOT
     my ($sd_index_deleted, $longdescs_index_deleted);
     my @tables = $self->bz_table_list_real();
     # We want to convert tables to InnoDB, but it's possible that they have 
-    # fulltext indexes on them, and conversation will fail unless we remove
+    # fulltext indexes on them, and conversion will fail unless we remove
     # the indexes.
     if (grep($_ eq 'bugs', @tables)) {
         if ($self->bz_index_info_real('bugs', 'short_desc')) {
@@ -268,6 +268,8 @@ EOT
             $self->bz_drop_index_raw('bugs', 'bugs_short_desc_idx');
             $sd_index_deleted = 1; # Used for later schema cleanup.
         }
+    }
+    if (grep($_ eq 'longdescs', @tables)) {
         if ($self->bz_index_info_real('longdescs', 'thetext')) {
             $self->bz_drop_index_raw('longdescs', 'thetext');
         }