Commit 8f3564d0 authored by unknown's avatar unknown
Browse files

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1

into deer.(none):/home/hf/work/mysql-4.1.5371

parents 5f8f320c 411ef7d7
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -3487,10 +3487,11 @@ static void fetch_float_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field,
    char *end;
    /* TODO: move this to a header shared between client and server. */
#define NOT_FIXED_DEC  31
    if (field->decimals >= 31)
    if (field->decimals >= NOT_FIXED_DEC)
#undef NOT_FIXED_DEC
    {
      sprintf(buff, "%-*.*g", (int) param->buffer_length, width, value);
      sprintf(buff, "%-*.*g", (int) min(sizeof(buff)-1, param->buffer_length),
	      width, value);
      end= strcend(buff, ' ');
      *end= 0;
    }