diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-02-02 11:47:01 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-02-02 11:47:01 +0100 |
| commit | 9b3e6c27b0615270042cff92c88cb338ded9b69f (patch) | |
| tree | cf543f7e60a54f4aafad66e7f45277b33e3b21f5 /client | |
| parent | 1a9ed28bd2667f664a4b6fb8cfea0c030d402d5a (diff) | |
| parent | fb6928cb24db155027074e06f619736e50e86015 (diff) | |
| download | mariadb-git-9b3e6c27b0615270042cff92c88cb338ded9b69f.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my50-mysqltest_float_result
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
client/mysqltest.c:
Auto merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index bd2a77f8438..6f212f784ef 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -3048,7 +3048,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 */ |