Bug 361158: UTF-8 conversion fails on MySQL 5 (attach_data.id; CHARACTER SET binary...

Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=bkor, a=justdave

diff --git a/Bugzilla/DB/Mysql.pm b/Bugzilla/DB/Mysql.pm
index 5dd598dff7042f8c4b3443e2499ea0a0c2935566..5a9a01416e5be80d53690dcde2a09247d317770b 100644 (file)
--- a/Bugzilla/DB/Mysql.pm
+++ b/Bugzilla/DB/Mysql.pm
@@ -577,7 +577,8 @@ EOT
             $info_sth->execute();
             while (my $column = $info_sth->fetchrow_hashref) {
                 # If this particular column isn't stored in utf-8
-                if ($column->{Collation} ne 'NULL' 
+                if ($column->{Collation}
+                    && $column->{Collation} ne 'NULL' 
                     && $column->{Collation} !~ /utf8/) 
                 {
                     my $name = $column->{Field};