[Rt-commit] r16923 - rt/3.8/trunk/etc/upgrade

[ruz at bestpractical.com]

Author: ruz
Date: Tue Nov 18 20:53:34 2008
New Revision: 16923

Modified:
   rt/3.8/trunk/etc/upgrade/schema.mysql-4.0-4.1.pl

Log:
* fix issue when upgrade script could generate ALTER TABLE ... BLOB CHARACTER SET ...

Modified: rt/3.8/trunk/etc/upgrade/schema.mysql-4.0-4.1.pl
==============================================================================
--- rt/3.8/trunk/etc/upgrade/schema.mysql-4.0-4.1.pl	(original)
+++ rt/3.8/trunk/etc/upgrade/schema.mysql-4.0-4.1.pl	Tue Nov 18 20:53:34 2008
@@ -249,7 +249,8 @@
     }
 
     my $collation = column_info($table, $column)->{'collation'};
-    my $current_charset = $collation? (split /_/, $collation)[0]: 'binary';
+    # mysql 4.1 returns literal NULL instead of undef
+    my $current_charset = $collation && $collation ne 'NULL'? (split /_/, $collation)[0]: 'binary';
     return if $required_charset eq $current_charset;
 
     if ( $required_charset eq 'binary' ) {