merged 5.0-bugteam -> 5.1-bugteam.

Fixed a warning in 5.1 caused by missing type cast.

sql/protocol.cc

@@ -598,7 +598,8 @@ bool Protocol::send_fields(List<Item> *list, uint flags)
                      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;