[Rt-commit] r15904 - in rt/3.8/trunk: .

[sartak at bestpractical.com]

Author: sartak
Date: Thu Sep 11 03:54:00 2008
New Revision: 15904

Modified:
   rt/3.8/trunk/   (props changed)
   rt/3.8/trunk/etc/upgrade/schema.mysql-4.0-4.1.pl

Log:
 r71621 at onn:  sartak | 2008-09-11 03:53:27 -0400
 Revert mismerge


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	Thu Sep 11 03:54:00 2008
@@ -353,14 +353,15 @@
 sub column_byte_length {
     my ($table, $column) = @_;
     if ( $version >= 5.0 ) {
-        return $dbh->selectrow_arrayref(
-            "SELECT CHARACTER_OCTET_LENGTH FROM information_schema.COLUMNS WHERE"
+        my ($char, $octet) = @{ $dbh->selectrow_arrayref(
+            "SELECT CHARACTER_MAXIMUM_LENGTH, CHARACTER_OCTET_LENGTH FROM information_schema.COLUMNS WHERE"
             ."     TABLE_SCHEMA = ". $dbh->quote($db_name)
             ." AND TABLE_NAME   = ". $dbh->quote($table)
             ." AND COLUMN_NAME  = ". $dbh->quote($column)
-        )->[0];
+        ) };
+        return $octet if $octet == $char;
     }
-    return $dbh->selectrow_arrayref("SELECT MAX(LENGTH(". $dbh->quote($column) .")) FROM $table")->[0];
+    return $dbh->selectrow_arrayref("SELECT MAX(LENGTH(". $dbh->quote_identifier($column) .")) FROM $table")->[0];
 }
 
 sub column_info {