Additional fix for bug 508023, to make upgrades from 3.1.4 succeed.

diff --git a/Bugzilla/DB/Schema/Mysql.pm b/Bugzilla/DB/Schema/Mysql.pm
index 49e6add1a862697ce8715c44ff2bf27372d285f7..95ef3141eeee1e9273c16ec43e0daa87767c44b3 100644 (file)
--- a/Bugzilla/DB/Schema/Mysql.pm
+++ b/Bugzilla/DB/Schema/Mysql.pm
@@ -189,13 +189,15 @@ sub get_alter_column_ddl {
     my %new_defaultless = %$new_def;
     delete $old_defaultless{DEFAULT};
     delete $new_defaultless{DEFAULT};
-    if ($self->columns_equal(\%new_defaultless, \%old_defaultless)) {
-        if (defined $old_def->{DEFAULT} and !defined $new_def->{DEFAULT}) {
+    if (!$self->columns_equal($old_def, $new_def)
+        && $self->columns_equal(\%new_defaultless, \%old_defaultless)) 
+    {
+        if (!defined $new_def->{DEFAULT}) {
             push(@statements,
                  "ALTER TABLE $table ALTER COLUMN $column DROP DEFAULT");
         }
         else {
-            push(@statements, "ALTER TABLE $table ALTER COLUMN $column 
+            push(@statements, "ALTER TABLE $table ALTER COLUMN $column
                                SET DEFAULT " . $new_def->{DEFAULT});
         }
     }