[Commits] Rev 2854: Corrected the fix for LP bug 672551. in file:///home/igor/maria/maria-5.3-mwl128/

Igor Babaev igor at askmonty.org
Sat Nov 13 02:53:21 EET 2010


At file:///home/igor/maria/maria-5.3-mwl128/

------------------------------------------------------------
revno: 2854
revision-id: igor at askmonty.org-20101113005320-y4cgp5huw5vo9u2b
parent: igor at askmonty.org-20101112005908-18gtyr4if2dyqo8c
committer: Igor Babaev <igor at askmonty.org>
branch nick: maria-5.3-mwl128
timestamp: Fri 2010-11-12 16:53:20 -0800
message:
  Corrected the fix for LP bug 672551.
-------------- next part --------------
=== modified file 'sql/field_conv.cc'
--- a/sql/field_conv.cc	2010-11-12 00:41:52 +0000
+++ b/sql/field_conv.cc	2010-11-13 00:53:20 +0000
@@ -553,14 +553,7 @@
   else
   { 
     to_null_ptr=  0;				// For easy debugging
-    /* Setup optimal copying for varchar */
-    if (from->real_type() == MYSQL_TYPE_VARCHAR)
-    {
-      do_copy= (((Field_varstring*) from)->length_bytes == 1 ?
-                 do_varstring1 : do_varstring2);
-    }  
-    else
-      do_copy= do_field_eq;
+    do_copy= do_field_eq;
   }
 }
 
@@ -722,7 +715,6 @@
         else 
           return  (((Field_varstring*) from)->length_bytes == 1 ?
                     do_varstring1 : do_varstring2);
-
       }
       else if (to_length < from_length)
 	return (from->charset()->mbmaxlen == 1 ?



More information about the commits mailing list