summaryrefslogtreecommitdiff
path: root/mysql-test/r/type_float.result
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/r/type_float.result')
-rw-r--r--mysql-test/r/type_float.result26
1 files changed, 24 insertions, 2 deletions
diff --git a/mysql-test/r/type_float.result b/mysql-test/r/type_float.result
index a46ff64e0ba..f2392681601 100644
--- a/mysql-test/r/type_float.result
+++ b/mysql-test/r/type_float.result
@@ -31,14 +31,14 @@ select * from t1;
f1 f2
10 10
100000 100000
-1.23457e+9 1234567890
+1.23457e+09 1234567890
1e+10 10000000000
1e+15 1e+15
1e+20 1e+20
3.40282e+38 1e+50
3.40282e+38 1e+150
-10 -10
-1e-5 1e-5
+1e-05 1e-05
1e-10 1e-10
1e-15 1e-15
1e-20 1e-20
@@ -240,6 +240,28 @@ t3 CREATE TABLE `t3` (
`d` double(22,9) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1, t2, t3;
+create table t1 select 105213674794682365.00 + 0.0 x;
+show warnings;
+Level Code Message
+desc t1;
+Field Type Null Key Default Extra
+x decimal(21,2) NO 0.00
+drop table t1;
+create table t1 select 0.0 x;
+desc t1;
+Field Type Null Key Default Extra
+x decimal(2,1) NO 0.0
+create table t2 select 105213674794682365.00 y;
+desc t2;
+Field Type Null Key Default Extra
+y decimal(20,2) NO 0.00
+create table t3 select x+y a from t1,t2;
+show warnings;
+Level Code Message
+desc t3;
+Field Type Null Key Default Extra
+a decimal(21,2) NO 0.00
+drop table t1,t2,t3;
create table t1 (s1 float(0,2));
ERROR 42000: For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column 's1').
create table t1 (s1 float(1,2));