Connector/ODBC 3.51 commit: r421 - trunk/driver

[bdegtyariov]

Modified:
   trunk/driver/utility.c
Log:
Commented the code that checked for binary flag (see the patch for bug#20208 that was
rolled back) in case of VAR_STRING. As the complaints from the customers keep going, we
had to clean up all the changes made in that patch.

Modified: trunk/driver/utility.c
===================================================================
--- trunk/driver/utility.c	2007-05-14 18:38:17 UTC (rev 420)
+++ trunk/driver/utility.c	2007-05-15 17:10:19 UTC (rev 421)
@@ -563,21 +563,25 @@
         */
         case MYSQL_TYPE_VARCHAR:
         case MYSQL_TYPE_VAR_STRING:
-              /* 
-              TODO: field->length should be replaced by max(length, maxlength)
-                    in order to restore FLAG_FIELD_LENGTH option
-              */
-              *transfer_length= *precision= *display_size= field->length ?
-                (stmt->dbc->mysql.charset ?
-                 field->length / stmt->dbc->mysql.charset->mbmaxlen :
-                 field->length) : 255;
+            /* 
+            TODO: field->length should be replaced by max(length, maxlength)
+                  in order to restore FLAG_FIELD_LENGTH option
+            */
+            *transfer_length= *precision= *display_size= field->length ?
+              (stmt->dbc->mysql.charset ?
+               field->length / stmt->dbc->mysql.charset->mbmaxlen :
+               field->length) : 255;
 
+            /*
+            TODO: Uncomment this code when MySQL Server returns the metadata correctly
+
             if (field_is_binary)
             {
                 if (buff)
                   strmov(buff,"varbinary");
                 return SQL_VARBINARY;
             }
+            */
 
             if (buff)
               strmov(buff,"varchar");