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/r/insert.result | |
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/r/insert.result')
-rw-r--r-- | mysql-test/r/insert.result | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/mysql-test/r/insert.result b/mysql-test/r/insert.result index 707cdb27768..919aff4bfb7 100644 --- a/mysql-test/r/insert.result +++ b/mysql-test/r/insert.result @@ -538,23 +538,23 @@ Warnings: Warning 1265 Data truncated for column 'c' at row 1 SELECT * FROM t1; a b c -9.999999000000000748 10 10 +9.999999 10 10 1.225e-05 1.2e-05 1e-0 0.0001225 0.00012 NULL -0.122499999999999998 0.1225 NULL -0.122587699999999994 0.12259 NULL +0.1225 0.1225 NULL +0.1225877 0.12259 NULL 12.25 12.25 NULL 12.25 12.25 12.2 122500 122500 NULL 12250000000 1.2e+10 NULL -1225000000000000 1.2e+15 NULL +1.225e+15 1.2e+15 NULL 5000000 5000000 NULL 1.25e+78 1.2e+78 NULL 1.25e-94 1.2e-94 NULL 1.25e+203 1e+203 NULL 1.25e-175 1e-175 NULL -1.225000000000000089 NULL 1.23 -1.370000000000000107 NULL 1.37 +1.225 NULL 1.23 +1.37 NULL 1.37 -1.37 NULL -1.3 0.00187 NULL 0.00 -0.0187 NULL -0.0 @@ -592,23 +592,23 @@ INSERT INTO t1(a,c) VALUES (5000e+0, 5000e+0); INSERT INTO t1(a,c) VALUES (-5000e+0, -5000e+0); SELECT * FROM t1; a b c -9.999999000000000748 10 9.999 +9.999999 10 9.999 1.225e-05 1.2e-05 1e-05 0.0001225 0.00012 NULL -0.122499999999999998 0.1225 NULL -0.122587699999999994 0.12259 NULL +0.1225 0.1225 NULL +0.1225877 0.12259 NULL 12.25 12.25 NULL 12.25 12.25 12.25 122500 122500 NULL 12250000000 1.2e+10 NULL -1225000000000000 1.2e+15 NULL +1.225e+15 1.2e+15 NULL 5000000 5000000 NULL 1.25e+78 1.2e+78 NULL 1.25e-94 1.2e-94 NULL 1.25e+203 1e+203 NULL 1.25e-175 1e-175 NULL -1.225000000000000089 NULL 1.225 -1.370000000000000107 NULL 1.37 +1.225 NULL 1.225 +1.37 NULL 1.37 -1.37 NULL -1.37 0.00187 NULL 0.002 -0.0187 NULL -0.01 |