List:Commits« Previous MessageNext Message »
From:Georgi Kodinov Date:February 27 2009 8:07am
Subject:bzr commit into mysql-5.1-bugteam branch (kgeorge:2827)
View as plain text  
#At file:///Users/kgeorge/mysql/work/B41354-merge-5.1-bugteam/ based on revid:bernt.johnsen@stripped

 2827 Georgi Kodinov	2009-02-27 [merge]
      merged 5.0-bugteam -> 5.1-bugteam.
      Fixed a warning in 5.1 caused by missing type cast.

    modified:
      sql/protocol.cc
=== modified file 'sql/protocol.cc'
--- a/sql/protocol.cc	2009-02-26 12:14:33 +0000
+++ b/sql/protocol.cc	2009-02-27 08:03:47 +0000
@@ -598,7 +598,8 @@ bool Protocol::send_fields(List<Item> *l
                      field.length / item->collation.collation->mbminlen :
                      field.length / item->collation.collation->mbmaxlen;
         max_length*= thd_charset->mbmaxlen;
-        field_length= (max_length > UINT_MAX32) ? UINT_MAX32 : max_length;
+        field_length= (max_length > UINT_MAX32) ? 
+          UINT_MAX32 : (uint32) max_length;
         int4store(pos + 2, field_length);
       }
       pos[6]= field.type;


Attachment: [text/bzr-bundle] bzr/kgeorge@mysql.com-20090227080347-hm31c33p2a1oxgv6.bundle
Thread
• bzr commit into mysql-5.1-bugteam branch (kgeorge:2827) Georgi Kodinov27 Feb