Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50

into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51

libmysql/libmysql.c

@@ -3873,15 +3873,19 @@ static void fetch_float_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field,
       sprintf(buff, "%.*f", (int) field->decimals, value);
       end= strend(buff);
     }
-    uint length= (uint) (end-buff);
+
+    {
+      size_t length= end - buff;
       if (field->flags & ZEROFILL_FLAG && length < field->length &&
-        field->length < MAX_DOUBLE_STRING_REP_LENGTH-1)
+          field->length < MAX_DOUBLE_STRING_REP_LENGTH - 1)
       {
-      bmove_upp((char*) buff+field->length,buff+length, length);
-      bfill((char*) buff, field->length - length,'0');
+        bmove_upp((char*) buff + field->length, buff + length, length);
+        bfill((char*) buff, field->length - length, '0');
         length= field->length;
       }
       fetch_string_with_conversion(param, buff, length);
+    }
+
     break;
   }
   }