diff options
| -rw-r--r-- | mysql-test/r/bigint.result | 3 | ||||
| -rw-r--r-- | mysql-test/r/func_misc.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/bigint.test | 2 | ||||
| -rw-r--r-- | strings/strtod.c | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/mysql-test/r/bigint.result b/mysql-test/r/bigint.result index 4c6e1645451..4c70e72bdfb 100644 --- a/mysql-test/r/bigint.result +++ b/mysql-test/r/bigint.result @@ -84,3 +84,6 @@ quantity 10000000000000000000 10000000000000000000 drop table t1; +SELECT '0x8000000000000001'+0; +'0x8000000000000001'+0 +0 diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result index ec5f76409e7..581bc54db18 100644 --- a/mysql-test/r/func_misc.result +++ b/mysql-test/r/func_misc.result @@ -1,6 +1,6 @@ select format(1.5555,0),format(123.5555,1),format(1234.5555,2),format(12345.5555,3),format(123456.5555,4),format(1234567.5555,5),format("12345.2399",2); format(1.5555,0) format(123.5555,1) format(1234.5555,2) format(12345.5555,3) format(123456.5555,4) format(1234567.5555,5) format("12345.2399",2) -2 123.6 1,234.56 12,345.556 123,456.5555 1,234,567.55550 12,345.24 +2 123.6 1,234.56 12,345.555 123,456.5555 1,234,567.55550 12,345.24 select inet_ntoa(inet_aton("255.255.255.255.255.255.255.255")); inet_ntoa(inet_aton("255.255.255.255.255.255.255.255")) NULL diff --git a/mysql-test/t/bigint.test b/mysql-test/t/bigint.test index 9bbe10eae8c..c509a4113f4 100644 --- a/mysql-test/t/bigint.test +++ b/mysql-test/t/bigint.test @@ -69,5 +69,5 @@ select * from t1; drop table t1; # atof() behaviour is different of different systems. to be fixed in 4.1 -#SELECT '0x8000000000000001'+0; +SELECT '0x8000000000000001'+0; diff --git a/strings/strtod.c b/strings/strtod.c index 63633b6808f..5b3be40cbf8 100644 --- a/strings/strtod.c +++ b/strings/strtod.c @@ -135,6 +135,6 @@ done: double my_atof(const char *nptr) { - return (strtod(nptr, 0)); + return (my_strtod(nptr, 0)); } |