Commit 2d8415ea authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my51-mysqltest_float_result 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


client/mysqltest.c:
  Auto merged
parents 4f732309 6de14ea1

client/mysqltest.c

+2 −1
Original line number Diff line number Diff line
@@ -3635,7 +3635,8 @@ static void append_field(DYNAMIC_STRING *ds, uint col_idx, MYSQL_FIELD* field, 
    len= 4;

  }

#ifdef __WIN__

  else if (field->type == MYSQL_TYPE_DOUBLE &&

  else if ((field->type == MYSQL_TYPE_DOUBLE ||

            field->type == MYSQL_TYPE_FLOAT ) &&

           field->decimals >= 31)

  {

    /* Convert 1.2e+018 to 1.2e+18 and 1.2e-018 to 1.2e-18 */