diff options
| author | unknown <kaa@polly.(none)> | 2007-12-01 15:40:59 +0300 |
|---|---|---|
| committer | unknown <kaa@polly.(none)> | 2007-12-01 15:40:59 +0300 |
| commit | ddffc434c082078c6b67d8fa919c48c1363c94a5 (patch) | |
| tree | 0ae9c55e4f6fc20a7cd212347d79f2a1b35dcaeb /mysql-test/t | |
| parent | f95b68320afc9be602379738e194ecaf0171eabe (diff) | |
| parent | 813fc2b9cf041d63c0bbc8aa924f8f9e7616517c (diff) | |
| download | mariadb-git-ddffc434c082078c6b67d8fa919c48c1363c94a5.tar.gz | |
Merge polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788
into polly.(none):/home/kaa/src/maint/mysql-5.1-maint
mysql-test/r/insert.result:
Auto merged
mysql-test/t/insert.test:
Auto merged
sql/field.cc:
Auto merged
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/cast.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/insert.test | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/mysql-test/t/cast.test b/mysql-test/t/cast.test index a140fe1d646..5563e260a06 100644 --- a/mysql-test/t/cast.test +++ b/mysql-test/t/cast.test @@ -177,6 +177,8 @@ select cast(1.0e+300 as signed int); CREATE TABLE t1 (f1 double); INSERT INTO t1 SET f1 = -1.0e+30 ; INSERT INTO t1 SET f1 = +1.0e+30 ; +# Expected result is +-1e+30, but Windows returns +-1e+030. +--replace_result 1e+030 1e+30 SELECT f1 AS double_val, CAST(f1 AS SIGNED INT) AS cast_val FROM t1; DROP TABLE t1; diff --git a/mysql-test/t/insert.test b/mysql-test/t/insert.test index b9415a3b08b..474929cacfe 100644 --- a/mysql-test/t/insert.test +++ b/mysql-test/t/insert.test @@ -420,7 +420,9 @@ INSERT INTO t1(a,c) VALUES (1.87e-3, 1.87e-3); INSERT INTO t1(a,c) VALUES (-1.87e-2, -1.87e-2); INSERT INTO t1(a,c) VALUES (5000e+0, 5000e+0); INSERT INTO t1(a,c) VALUES (-5000e+0, -5000e+0); - +# Expected results are "12.2" and "1.2e+78", but Windows returns "12.3" and +# "1.3e+78" due to different rounding rules +--replace_result 12.3 12.2 1.3e+78 1.2e+78 SELECT * FROM t1; DROP TABLE t1; |