diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-22 19:23:13 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-22 19:23:13 +0300 |
| commit | 12f364ece7663663cabdc29f106ca69af63fe4e7 (patch) | |
| tree | 40437c602d2a9ddaa03a54742cec4884f0974253 /mysql-test | |
| parent | d4f23f0cf6db38731a161c5c7b0b056fc67e5c02 (diff) | |
| download | mariadb-git-12f364ece7663663cabdc29f106ca69af63fe4e7.tar.gz | |
Backport of WL #2934: Make/find library for doing float/double
to string conversions and vice versa"
Initial import of the dtoa.c code and custom wrappers around it
to allow its usage from the server code.
Conversion of FLOAT/DOUBLE values to DECIMAL ones or strings
and vice versa has been significantly reworked. As the new
algoritms are more precise than the older ones, results of such
conversions may not always match those obtained from older
server versions. This in turn may break compatibility for some
applications.
This patch also fixes the following bugs:
- bug #12860 "Difference in zero padding of exponent between
Unix and Windows"
- bug #21497 "DOUBLE truncated to unusable value"
- bug #26788 "mysqld (debug) aborts when inserting specific
numbers into char fields"
- bug #24541 "Data truncated..." on decimal type columns
without any good reason"
Diffstat (limited to 'mysql-test')
36 files changed, 519 insertions, 454 deletions
diff --git a/mysql-test/r/archive_gis.result b/mysql-test/r/archive_gis.result index 178c5716911..ad7bd374629 100644 --- a/mysql-test/r/archive_gis.result +++ b/mysql-test/r/archive_gis.result @@ -266,7 +266,7 @@ fid AsText(EndPoint(g)) 107 POINT(40 10) SELECT fid, GLength(g) FROM gis_line ORDER by fid; fid GLength(g) -105 24.142135623731 +105 24.14213562373095 106 40 107 30 SELECT fid, NumPoints(g) FROM gis_line ORDER by fid; @@ -292,7 +292,7 @@ Note 1003 select astext(startpoint(`test`.`gis_line`.`g`)) AS `AsText(StartPoint SELECT fid, AsText(Centroid(g)) FROM gis_polygon ORDER by fid; fid AsText(Centroid(g)) 108 POINT(15 15) -109 POINT(25.4166666666667 25.4166666666667) +109 POINT(25.416666666666668 25.416666666666668) 110 POINT(20 10) SELECT fid, Area(g) FROM gis_polygon ORDER by fid; fid Area(g) @@ -326,8 +326,8 @@ fid IsClosed(g) 116 0 SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon ORDER by fid; fid AsText(Centroid(g)) -117 POINT(55.5885277530424 17.426536064114) -118 POINT(55.5885277530424 17.426536064114) +117 POINT(55.58852775304245 17.426536064113982) +118 POINT(55.58852775304245 17.426536064113982) 119 POINT(2 2) SELECT fid, Area(g) FROM gis_multi_polygon ORDER by fid; fid Area(g) diff --git a/mysql-test/r/cast.result b/mysql-test/r/cast.result index c53de220b60..3e1ea824db5 100644 --- a/mysql-test/r/cast.result +++ b/mysql-test/r/cast.result @@ -342,11 +342,11 @@ INSERT INTO t1 SET f1 = -1.0e+30 ; INSERT INTO t1 SET f1 = +1.0e+30 ; SELECT f1 AS double_val, CAST(f1 AS SIGNED INT) AS cast_val FROM t1; double_val cast_val --1e+30 -9223372036854775808 -1e+30 9223372036854775807 +-1e30 -9223372036854775808 +1e30 9223372036854775807 Warnings: -Warning 1292 Truncated incorrect INTEGER value: '-1e+30' -Warning 1292 Truncated incorrect INTEGER value: '1e+30' +Warning 1292 Truncated incorrect INTEGER value: '-1e30' +Warning 1292 Truncated incorrect INTEGER value: '1e30' DROP TABLE t1; select isnull(date(NULL)), isnull(cast(NULL as DATE)); isnull(date(NULL)) isnull(cast(NULL as DATE)) @@ -363,7 +363,7 @@ cast('1.2' as decimal(3,2)) 1.20 select 1e18 * cast('1.2' as decimal(3,2)); 1e18 * cast('1.2' as decimal(3,2)) -1.2e+18 +1.2e18 select cast(cast('1.2' as decimal(3,2)) as signed); cast(cast('1.2' as decimal(3,2)) as signed) 1 diff --git a/mysql-test/r/func_group.result b/mysql-test/r/func_group.result index b36f561578b..6838dcf944c 100644 --- a/mysql-test/r/func_group.result +++ b/mysql-test/r/func_group.result @@ -61,7 +61,7 @@ grp sum NULL NULL 1 7 2 20.25 -3 45.4831632475944 +3 45.48316324759439 create table t2 (grp int, a bigint unsigned, c char(10)); insert into t2 select grp,max(a)+max(grp),max(c) from t1 group by grp; replace into t2 select grp, a, c from t1 limit 2,1; @@ -891,7 +891,7 @@ select 1e8 * sum(distinct df) from t1; 330000000 select 1e8 * min(df) from t1; 1e8 * min(df) -110000000 +110000000.00000001 create table t3 (ifl int); insert into t3 values(1), (2); select cast(min(ifl) as decimal(5,2)) from t3; @@ -1186,7 +1186,7 @@ std(s1/s2) 0.21325764 select std(o1/o2) from bug22555; std(o1/o2) -0.213257635866493 +0.2132576358664934 select std(e1/e2) from bug22555; std(e1/e2) 0.21325764 @@ -1209,13 +1209,13 @@ i count(*) std(e1/e2) 3 4 0.000000000000000000000000000000 select round(std(s1/s2), 17) from bug22555; round(std(s1/s2), 17) -0.21325763586649341 +0.21325763586649340 select std(o1/o2) from bug22555; std(o1/o2) -0.213257635866493 +0.2132576358664934 select round(std(e1/e2), 17) from bug22555; round(std(e1/e2), 17) -0.21325763586649341 +0.21325763586649340 set div_precision_increment=20; select i, count(*), std(s1/s2) from bug22555 group by i order by i; i count(*) std(s1/s2) @@ -1234,13 +1234,13 @@ i count(*) std(e1/e2) 3 4 0.000000000000000000000000000000 select round(std(s1/s2), 17) from bug22555; round(std(s1/s2), 17) -0.21325763586649341 +0.21325763586649340 select std(o1/o2) from bug22555; std(o1/o2) -0.213257635866493 +0.2132576358664934 select round(std(e1/e2), 17) from bug22555; round(std(e1/e2), 17) -0.21325763586649341 +0.21325763586649340 set @@div_precision_increment=@saved_div_precision_increment; drop table bug22555; create table bug22555 (s smallint, o double, e decimal); diff --git a/mysql-test/r/func_math.result b/mysql-test/r/func_math.result index 063f4d37f4a..537b1db9781 100644 --- a/mysql-test/r/func_math.result +++ b/mysql-test/r/func_math.result @@ -44,7 +44,7 @@ Warnings: Note 1003 select abs(-(10)) AS `abs(-10)`,sign(-(5)) AS `sign(-5)`,sign(5) AS `sign(5)`,sign(0) AS `sign(0)` select log(exp(10)),exp(log(sqrt(10))*2),log(-1),log(NULL),log(1,1),log(3,9),log(-1,2),log(NULL,2); log(exp(10)) exp(log(sqrt(10))*2) log(-1) log(NULL) log(1,1) log(3,9) log(-1,2) log(NULL,2) -10 10 NULL NULL NULL 2 NULL NULL +10 10.000000000000002 NULL NULL NULL 2 NULL NULL explain extended select log(exp(10)),exp(log(sqrt(10))*2),log(-1),log(NULL),log(1,1),log(3,9),log(-1,2),log(NULL,2); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used @@ -52,7 +52,7 @@ Warnings: Note 1003 select log(exp(10)) AS `log(exp(10))`,exp((log(sqrt(10)) * 2)) AS `exp(log(sqrt(10))*2)`,log(-(1)) AS `log(-1)`,log(NULL) AS `log(NULL)`,log(1,1) AS `log(1,1)`,log(3,9) AS `log(3,9)`,log(-(1),2) AS `log(-1,2)`,log(NULL,2) AS `log(NULL,2)` select ln(exp(10)),exp(ln(sqrt(10))*2),ln(-1),ln(0),ln(NULL); ln(exp(10)) exp(ln(sqrt(10))*2) ln(-1) ln(0) ln(NULL) -10 10 NULL NULL NULL +10 10.000000000000002 NULL NULL NULL explain extended select ln(exp(10)),exp(ln(sqrt(10))*2),ln(-1),ln(0),ln(NULL); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used @@ -60,7 +60,7 @@ Warnings: Note 1003 select ln(exp(10)) AS `ln(exp(10))`,exp((ln(sqrt(10)) * 2)) AS `exp(ln(sqrt(10))*2)`,ln(-(1)) AS `ln(-1)`,ln(0) AS `ln(0)`,ln(NULL) AS `ln(NULL)` select log2(8),log2(15),log2(-2),log2(0),log2(NULL); log2(8) log2(15) log2(-2) log2(0) log2(NULL) -3 3.90689059560852 NULL NULL NULL +3 3.9068905956085187 NULL NULL NULL explain extended select log2(8),log2(15),log2(-2),log2(0),log2(NULL); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used @@ -68,7 +68,7 @@ Warnings: Note 1003 select log2(8) AS `log2(8)`,log2(15) AS `log2(15)`,log2(-(2)) AS `log2(-2)`,log2(0) AS `log2(0)`,log2(NULL) AS `log2(NULL)` select log10(100),log10(18),log10(-4),log10(0),log10(NULL); log10(100) log10(18) log10(-4) log10(0) log10(NULL) -2 1.25527250510331 NULL NULL NULL +2 1.255272505103306 NULL NULL NULL explain extended select log10(100),log10(18),log10(-4),log10(0),log10(NULL); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used @@ -85,7 +85,7 @@ Note 1003 select pow(10,log10(10)) AS `pow(10,log10(10))`,pow(2,4) AS `power(2,4 set @@rand_seed1=10000000,@@rand_seed2=1000000; select rand(999999),rand(); rand(999999) rand() -0.0142313651873091 0.028870999839968 +0.014231365187309091 0.028870999839968048 explain extended select rand(999999),rand(); id select_type table type possible_keys key key_len ref rows filtered Extra 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL NULL No tables used @@ -101,7 +101,7 @@ Warnings: Note 1003 select pi() AS `pi()`,format(sin((pi() / 2)),6) AS `format(sin(pi()/2),6)`,format(cos((pi() / 2)),6) AS `format(cos(pi()/2),6)`,format(abs(tan(pi())),6) AS `format(abs(tan(pi())),6)`,format((1 / tan(1)),6) AS `format(cot(1),6)`,format(asin(1),6) AS `format(asin(1),6)`,format(acos(0),6) AS `format(acos(0),6)`,format(atan(1),6) AS `format(atan(1),6)` select degrees(pi()),radians(360); degrees(pi()) radians(360) -180 6.28318530717959 +180 6.283185307179586 select format(atan(-2, 2), 6); format(atan(-2, 2), 6) -0.785398 @@ -119,7 +119,7 @@ ACOS(1.0) 0 SELECT ASIN(1.0); ASIN(1.0) -1.5707963267949 +1.5707963267948966 SELECT ACOS(0.2*5.0); ACOS(0.2*5.0) 0 @@ -128,10 +128,10 @@ ACOS(0.5*2.0) 0 SELECT ASIN(0.8+0.2); ASIN(0.8+0.2) -1.5707963267949 +1.5707963267948966 SELECT ASIN(1.2-0.2); ASIN(1.2-0.2) -1.5707963267949 +1.5707963267948966 select format(4.55, 1), format(4.551, 1); format(4.55, 1) format(4.551, 1) 4.6 4.6 @@ -368,7 +368,7 @@ mod(5, cast(-2 as unsigned)) mod(5, 18446744073709551614) mod(5, -2) 5 5 1 select pow(cast(-2 as unsigned), 5), pow(18446744073709551614, 5), pow(-2, 5); pow(cast(-2 as unsigned), 5) pow(18446744073709551614, 5) pow(-2, 5) -2.13598703592091e+96 2.13598703592091e+96 -32 +2.13598703592091e96 2.13598703592091e96 -32 CREATE TABLE t1 (a timestamp, b varchar(20), c bit(1)); INSERT INTO t1 VALUES('1998-09-23', 'str1', 1), ('2003-03-25', 'str2', 0); SELECT a DIV 900 y FROM t1 GROUP BY y; @@ -437,10 +437,10 @@ a ROUND(a) 2.5 2 -2.9 -3 2.9 3 --1e+16 -10000000000000000 -1e+16 10000000000000000 --1e+16 -10000000000000002 -1e+16 10000000000000002 +-1e16 -10000000000000000 +1e16 10000000000000000 +-1.0000000000000002e16 -10000000000000002 +1.0000000000000002e16 10000000000000002 DROP TABLE t1; CREATE TABLE t1(f1 LONGTEXT) engine=myisam; INSERT INTO t1 VALUES ('a'); @@ -475,16 +475,16 @@ NULL CREATE OR REPLACE VIEW v1 AS SELECT NULL AS a; SELECT RAND(a) FROM v1; RAND(a) -0.155220427694936 +0.15522042769493574 DROP VIEW v1; SELECT RAND(a) FROM (SELECT NULL AS a) b; RAND(a) -0.155220427694936 +0.15522042769493574 CREATE TABLE t1 (i INT); INSERT INTO t1 VALUES (NULL); SELECT RAND(i) FROM t1; RAND(i) -0.155220427694936 +0.15522042769493574 DROP TABLE t1; # select 123456789012345678901234567890.123456789012345678901234567890 div 1 as x; diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result index 64988f9de50..3d43cbbfd76 100644 --- a/mysql-test/r/func_str.result +++ b/mysql-test/r/func_str.result @@ -1354,10 +1354,10 @@ cast(rtrim(ltrim(' 20.06 ')) as decimal(19,2)) 20.06 select conv("18383815659218730760",10,10) + 0; conv("18383815659218730760",10,10) + 0 -1.83838156592187e+19 +1.838381565921873e19 select "18383815659218730760" + 0; "18383815659218730760" + 0 -1.83838156592187e+19 +1.838381565921873e19 CREATE TABLE t1 (code varchar(10)); INSERT INTO t1 VALUES ('a12'), ('A12'), ('a13'); SELECT ASCII(code), code FROM t1 WHERE code='A12'; diff --git a/mysql-test/r/gis.result b/mysql-test/r/gis.result index 3e28227d542..60e24819fa5 100644 --- a/mysql-test/r/gis.result +++ b/mysql-test/r/gis.result @@ -258,7 +258,7 @@ fid AsText(EndPoint(g)) 107 POINT(40 10) SELECT fid, GLength(g) FROM gis_line; fid GLength(g) -105 24.142135623731 +105 24.14213562373095 106 40 107 30 SELECT fid, NumPoints(g) FROM gis_line; @@ -284,7 +284,7 @@ Note 1003 select astext(startpoint(`test`.`gis_line`.`g`)) AS `AsText(StartPoint SELECT fid, AsText(Centroid(g)) FROM gis_polygon; fid AsText(Centroid(g)) 108 POINT(15 15) -109 POINT(25.4166666666667 25.4166666666667) +109 POINT(25.416666666666668 25.416666666666668) 110 POINT(20 10) SELECT fid, Area(g) FROM gis_polygon; fid Area(g) @@ -318,8 +318,8 @@ fid IsClosed(g) 116 0 SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon; fid AsText(Centroid(g)) -117 POINT(55.5885277530424 17.426536064114) -118 POINT(55.5885277530424 17.426536064114) +117 POINT(55.58852775304245 17.426536064113982) +118 POINT(55.58852775304245 17.426536064113982) 119 POINT(2 2) SELECT fid, Area(g) FROM gis_multi_polygon; fid Area(g) @@ -651,11 +651,11 @@ insert into t1 values ('85984',GeomFromText('MULTIPOLYGON(((-115.006363 select object_id, geometrytype(geo), ISSIMPLE(GEO), ASTEXT(centroid(geo)) from t1 where object_id=85998; object_id geometrytype(geo) ISSIMPLE(GEO) ASTEXT(centroid(geo)) -85998 MULTIPOLYGON 0 POINT(115.318773152032 -36.2374728210215) +85998 MULTIPOLYGON 0 POINT(115.31877315203187 -36.23747282102153) select object_id, geometrytype(geo), ISSIMPLE(GEO), ASTEXT(centroid(geo)) from t1 where object_id=85984; object_id geometrytype(geo) ISSIMPLE(GEO) ASTEXT(centroid(geo)) -85984 MULTIPOLYGON 0 POINT(-114.877871869233 36.3310176346905) +85984 MULTIPOLYGON 0 POINT(-114.87787186923313 36.33101763469059) drop table t1; create table t1 (fl geometry not null); insert into t1 values (1); diff --git a/mysql-test/r/innodb_gis.result b/mysql-test/r/innodb_gis.result index c6c775afc9f..0ce1ebe56ad 100644 --- a/mysql-test/r/innodb_gis.result +++ b/mysql-test/r/innodb_gis.result @@ -266,7 +266,7 @@ fid AsText(EndPoint(g)) 107 POINT(40 10) SELECT fid, GLength(g) FROM gis_line ORDER by fid; fid GLength(g) -105 24.142135623731 +105 24.14213562373095 106 40 107 30 SELECT fid, NumPoints(g) FROM gis_line ORDER by fid; @@ -292,7 +292,7 @@ Note 1003 select astext(startpoint(`test`.`gis_line`.`g`)) AS `AsText(StartPoint SELECT fid, AsText(Centroid(g)) FROM gis_polygon ORDER by fid; fid AsText(Centroid(g)) 108 POINT(15 15) -109 POINT(25.4166666666667 25.4166666666667) +109 POINT(25.416666666666668 25.416666666666668) 110 POINT(20 10) SELECT fid, Area(g) FROM gis_polygon ORDER by fid; fid Area(g) @@ -326,8 +326,8 @@ fid IsClosed(g) 116 0 SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon ORDER by fid; fid AsText(Centroid(g)) -117 POINT(55.5885277530424 17.426536064114) -118 POINT(55.5885277530424 17.426536064114) +117 POINT(55.58852775304245 17.426536064113982) +118 POINT(55.58852775304245 17.426536064113982) 119 POINT(2 2) SELECT fid, Area(g) FROM gis_multi_polygon ORDER by fid; fid Area(g) diff --git a/mysql-test/r/insert.result b/mysql-test/r/insert.result index 36d2b9ef348..b322c5da73a 100644 --- a/mysql-test/r/insert.result +++ b/mysql-test/r/insert.result @@ -175,12 +175,12 @@ Warning 1264 Out of range value for column 'f_float_3_1_u' at row 1 select * from t1 where number =last_insert_id(); number 4 original_value 1e+1111111111a -f_double 1.79769313486232e+308 -f_float 3.40282e+38 +f_double 1.7976931348623157e308 +f_float 3.40282e38 f_double_7_2 99999.99 f_float_4_3 9.999 -f_double_u 1.79769313486232e+308 -f_float_u 3.40282e+38 +f_double_u 1.7976931348623157e308 +f_float_u 3.40282e38 f_double_15_1_u 99999999999999.9 f_float_3_1_u 99.9 set @value= "-1e+1111111111a"; @@ -204,8 +204,8 @@ Warning 1264 Out of range value for column 'f_float_3_1_u' at row 1 select * from t1 where number =last_insert_id(); number 5 original_value -1e+1111111111a -f_double -1.79769313486232e+308 -f_float -3.40282e+38 +f_double -1.7976931348623157e308 +f_float -3.40282e38 f_double_7_2 -99999.99 f_float_4_3 -9.999 f_double_u 0 @@ -227,13 +227,13 @@ Warning 1264 Out of range value for column 'f_double_15_1_u' at row 1 Warning 1264 Out of range value for column 'f_float_3_1_u' at row 1 select * from t1 where number =last_insert_id(); number 6 -original_value 1e+111 -f_double 1e+111 -f_float 3.40282e+38 +original_value 1e111 +f_double 1e111 +f_float 3.40282e38 f_double_7_2 99999.99 f_float_4_3 9.999 -f_double_u 1e+111 -f_float_u 3.40282e+38 +f_double_u 1e111 +f_float_u 3.40282e38 f_double_15_1_u 99999999999999.9 f_float_3_1_u 99.9 set @value= -1e+111; @@ -248,9 +248,9 @@ Warning 1264 Out of range value for column 'f_double_15_1_u' at row 1 Warning 1264 Out of range value for column 'f_float_3_1_u' at row 1 select * from t1 where number =last_insert_id(); number 7 -original_value -1e+111 -f_double -1e+111 -f_float -3.40282e+38 +original_value -1e111 +f_double -1e111 +f_float -3.40282e38 f_double_7_2 -99999.99 f_float_4_3 -9.999 f_double_u 0 @@ -524,42 +524,36 @@ INSERT INTO t1(a,b) VALUES (1.25e-175, 1.25e-175); INSERT INTO t1(a,c) VALUES (1.225e+0, 1.225e+0); INSERT INTO t1(a,c) VALUES (1.37e+0, 1.37e+0); INSERT INTO t1(a,c) VALUES (-1.37e+0, -1.37e+0); -Warnings: -Warning 1265 Data truncated for column 'c' at row 1 INSERT INTO t1(a,c) VALUES (1.87e-3, 1.87e-3); Warnings: Warning 1265 Data truncated for column 'c' at row 1 INSERT INTO t1(a,c) VALUES (-1.87e-2, -1.87e-2); -Warnings: -Warning 1265 Data truncated for column 'c' at row 1 INSERT INTO t1(a,c) VALUES (5000e+0, 5000e+0); INSERT INTO t1(a,c) VALUES (-5000e+0, -5000e+0); -Warnings: -Warning 1265 Data truncated for column 'c' at row 1 SELECT * FROM t1; a b c 9.999999 10 10 -1.225e-05 1.2e-05 1e-0 -0.0001225 0.00012 NULL +0.00001225 1.22e-5 1e-5 +0.0001225 1.22e-4 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 -1.225e+15 1.2e+15 NULL +12250000000 1.22e10 NULL +1.225e15 1.22e15 NULL 5000000 5000000 NULL -1.25e+78 1.2e+78 NULL +1.25e78 1.25e78 NULL 1.25e-94 1.2e-94 NULL -1.25e+203 1e+203 NULL +1.25e203 1.2e203 NULL 1.25e-175 1e-175 NULL 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 +-1.37 NULL -1.4 +0.00187 NULL 2e-3 +-0.0187 NULL 0 5000 NULL 5000 --5000 NULL -500 +-5000 NULL -5e3 DROP TABLE t1; CREATE TABLE t1 ( a char(20) NOT NULL, @@ -586,32 +580,30 @@ INSERT INTO t1(a,c) VALUES (1.37e+0, 1.37e+0); INSERT INTO t1(a,c) VALUES (-1.37e+0, -1.37e+0); INSERT INTO t1(a,c) VALUES (1.87e-3, 1.87e-3); INSERT INTO t1(a,c) VALUES (-1.87e-2, -1.87e-2); -Warnings: -Warning 1265 Data truncated for column 'c' at row 1 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.999999 10 9.999 -1.225e-05 1.2e-05 1e-05 -0.0001225 0.00012 NULL +0.00001225 1.22e-5 1e-5 +0.0001225 1.22e-4 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 -1.225e+15 1.2e+15 NULL +12250000000 1.22e10 NULL +1.225e15 1.22e15 NULL 5000000 5000000 NULL -1.25e+78 1.2e+78 NULL +1.25e78 1.25e78 NULL 1.25e-94 1.2e-94 NULL -1.25e+203 1e+203 NULL +1.25e203 1.2e203 NULL 1.25e-175 1e-175 NULL 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 +-0.0187 NULL -0.02 5000 NULL 5000 -5000 NULL -5000 DROP TABLE t1; diff --git a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result index 1e488b320d7..5e25132880f 100644 --- a/mysql-test/r/loaddata.result +++ b/mysql-test/r/loaddata.result @@ -251,15 +251,15 @@ CREATE TABLE t1 (c1 INT, c2 TIMESTAMP, c3 REAL, c4 DOUBLE); INSERT INTO t1 (c1, c2, c3, c4) VALUES (10, '1970-02-01 01:02:03', 1.1E-100, 1.1E+100); SELECT * FROM t1; c1 c2 c3 c4 -10 1970-02-01 01:02:03 1.1e-100 1.1e+100 +10 1970-02-01 01:02:03 1.1e-100 1.1e100 SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1' FIELDS ENCLOSED BY '-' FROM t1; --10- -1970\-02\-01 01:02:03- -1.1e\-100- -1.1e+100- +-10- -1970\-02\-01 01:02:03- -1.1e\-100- -1.1e100- EOF TRUNCATE t1; LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/t1' INTO TABLE t1 FIELDS ENCLOSED BY '-'; SELECT * FROM t1; c1 c2 c3 c4 -10 1970-02-01 01:02:03 1.1e-100 1.1e+100 +10 1970-02-01 01:02:03 1.1e-100 1.1e100 DROP TABLE t1; # -- diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result index 13d36fab2f1..4724a111837 100644 --- a/mysql-test/r/mysqldump.result +++ b/mysql-test/r/mysqldump.result @@ -55,7 +55,7 @@ CREATE TABLE `t1` ( `a` double DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1; /*!40101 SET character_set_client = @saved_cs_client */; -INSERT INTO `t1` VALUES (RES); +INSERT INTO `t1` VALUES (-1.7976931348623157e308); DROP TABLE t1; # # Bug#3361 mysqldump quotes DECIMAL values inconsistently diff --git a/mysql-test/r/parser.result b/mysql-test/r/parser.result index 7e703de0876..467bb7c5cb8 100644 --- a/mysql-test/r/parser.result +++ b/mysql-test/r/parser.result @@ -522,7 +522,7 @@ select conv(255 AS p1, 10 AS p2, 16 AS p3); ERROR 42000: Incorrect parameters in the call to native function 'conv' select atan(10); atan(10) -1.47112767430373 +1.4711276743037347 select atan(10 AS p1); ERROR 42000: Incorrect parameters in the call to native function 'atan' select atan(10 p1); @@ -533,7 +533,7 @@ select atan(10 "p1"); ERROR 42000: Incorrect parameters in the call to native function 'atan' select atan(10, 20); atan(10, 20) -0.463647609000806 +0.4636476090008061 select atan(10 AS p1, 20); ERROR 42000: Incorrect parameters in the call to native function 'atan' select atan(10 p1, 20); diff --git a/mysql-test/r/ps_2myisam.result b/mysql-test/r/ps_2myisam.result index c51863b73f7..4f9444c1542 100644 --- a/mysql-test/r/ps_2myisam.result +++ b/mysql-test/r/ps_2myisam.result @@ -2585,10 +2585,10 @@ c3 8388607 c4 2147483647 c5 2147483647 c6 9223372036854775807 -c7 9.22337e+18 -c8 9.22337203685478e+18 -c9 9.22337203685478e+18 -c10 9.22337203685478e+18 +c7 9.22337e18 +c8 9.223372036854776e18 +c9 9.223372036854776e18 +c10 9.223372036854776e18 c12 9999.9999 execute my_delete ; set @arg00= '9223372036854775807' ; @@ -2608,10 +2608,10 @@ c3 8388607 c4 2147483647 c5 2147483647 c6 9223372036854775807 -c7 9.22337e+18 -c8 9.22337203685478e+18 -c9 9.22337203685478e+18 -c10 9.22337203685478e+18 +c7 9.22337e18 +c8 9.223372036854776e18 +c9 9.223372036854776e18 +c10 9.223372036854776e18 c12 9999.9999 execute my_delete ; set @arg00= -9223372036854775808 ; @@ -2631,10 +2631,10 @@ c3 -8388608 c4 -2147483648 c5 -2147483648 c6 -9223372036854775808 -c7 -9.22337e+18 -c8 -9.22337203685478e+18 -c9 -9.22337203685478e+18 -c10 -9.22337203685478e+18 +c7 -9.22337e18 +c8 -9.223372036854776e18 +c9 -9.223372036854776e18 +c10 -9.223372036854776e18 c12 -9999.9999 execute my_delete ; set @arg00= '-9223372036854775808' ; @@ -2654,10 +2654,10 @@ c3 -8388608 c4 -2147483648 c5 -2147483648 c6 -9223372036854775808 -c7 -9.22337e+18 -c8 -9.22337203685478e+18 -c9 -9.22337203685478e+18 -c10 -9.22337203685478e+18 +c7 -9.22337e18 +c8 -9.223372036854776e18 +c9 -9.223372036854776e18 +c10 -9.223372036854776e18 c12 -9999.9999 execute my_delete ; set @arg00= 1.11111111111111111111e+50 ; @@ -2679,10 +2679,10 @@ c3 8388607 c4 2147483647 c5 2147483647 c6 9223372036854775807 -c7 3.40282e+38 -c8 1.11111111111111e+50 -c9 1.11111111111111e+50 -c10 1.11111111111111e+50 +c7 3.40282e38 +c8 1.111111111111111e50 +c9 1.111111111111111e50 +c10 1.111111111111111e50 c12 9999.9999 execute my_delete ; set @arg00= '1.11111111111111111111e+50' ; @@ -2704,10 +2704,10 @@ c3 8388607 c4 2147483647 c5 2147483647 c6 9223372036854775807 -c7 3.40282e+38 -c8 1.11111111111111e+50 -c9 1.11111111111111e+50 -c10 1.11111111111111e+50 +c7 3.40282e38 +c8 1.111111111111111e50 +c9 1.111111111111111e50 +c10 1.111111111111111e50 c12 9999.9999 execute my_delete ; set @arg00= -1.11111111111111111111e+50 ; @@ -2729,10 +2729,10 @@ c3 -8388608 c4 -2147483648 c5 -2147483648 c6 -9223372036854775808 -c7 -3.40282e+38 -c8 -1.11111111111111e+50 -c9 -1.11111111111111e+50 -c10 -1.11111111111111e+50 +c7 -3.40282e38 +c8 -1.111111111111111e50 +c9 -1.111111111111111e50 +c10 -1.111111111111111e50 c12 -9999.9999 execute my_delete ; set @arg00= '-1.11111111111111111111e+50' ; @@ -2754,10 +2754,10 @@ c3 -8388608 c4 -2147483648 c5 -2147483648 c6 -9223372036854775808 -c7 -3.40282e+38 -c8 -1.11111111111111e+50 -c9 -1.11111111111111e+50 -c10 -1.11111111111111e+50 +c7 -3.40282e38 +c8 -1.111111111111111e50 +c9 -1.111111111111111e50 +c10 -1.111111111111111e50 c12 -9999.9999 execute my_delete ; test_sequence @@ -2822,10 +2822,10 @@ c1 c20 c21 c22 c23 c24 c25 c26 c27 c28 c29 c30 51 5 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0 52 5 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0 53 5 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0 -54 5 54 54 54.00 54.00 54.00 54.00 54.00 54.00 54.00 54.00 -55 5 55 55 55 55 55 55 55 55 55 55 -56 6 56 56 56.00 56.00 56.00 56.00 56.00 56.00 56.00 56.00 -57 6 57 57 57.00 57.00 57.00 57.00 57.00 57.00 57.00 57.00 +54 5 54 54 54 54 54 54 54 54 54 54 +55 6 55 55 55 55 55 55 55 55 55 55 +56 6 56 56 56 56 56 56 56 56 56 56 +57 6 57 57 57 57 57 57 57 57 57 57 60 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 61 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 62 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL @@ -3039,7 +3039,7 @@ c1 c13 c14 c15 c16 c17 42 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 43 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 50 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 -51 2010-00-00 2010-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 +51 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 52 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 53 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 60 NULL NULL 1991-01-01 01:01:01 NULL NULL diff --git a/mysql-test/r/ps_3innodb.result b/mysql-test/r/ps_3innodb.result index 2670451f24e..772a7462342 100644 --- a/mysql-test/r/ps_3innodb.result +++ b/mysql-test/r/ps_3innodb.result @@ -2568,10 +2568,10 @@ c3 8388607 c4 2147483647 c5 2147483647 c6 9223372036854775807 -c7 9.22337e+18 -c8 9.22337203685478e+18 -c9 9.22337203685478e+18 -c10 9.22337203685478e+18 +c7 9.22337e18 +c8 9.223372036854776e18 +c9 9.223372036854776e18 +c10 9.223372036854776e18 c12 9999.9999 execute my_delete ; set @arg00= '9223372036854775807' ; @@ -2591,10 +2591,10 @@ c3 8388607 c4 2147483647 c5 2147483647 c6 9223372036854775807 -c7 9.22337e+18 -c8 9.22337203685478e+18 -c9 9.22337203685478e+18 -c10 9.22337203685478e+18 +c7 9.22337e18 +c8 9.223372036854776e18 +c9 9.223372036854776e18 +c10 9.223372036854776e18 c12 9999.9999 execute my_delete ; set @arg00= -9223372036854775808 ; @@ -2614,10 +2614,10 @@ c3 -8388608 c4 -2147483648 c5 -2147483648 c6 -9223372036854775808 -c7 -9.22337e+18 -c8 -9.22337203685478e+18 -c9 -9.22337203685478e+18 -c10 -9.22337203685478e+18 +c7 -9.22337e18 +c8 -9.223372036854776e18 +c9 -9.223372036854776e18 +c10 -9.223372036854776e18 c12 -9999.9999 execute my_delete ; set @arg00= '-9223372036854775808' ; @@ -2637,10 +2637,10 @@ c3 -8388608 c4 -2147483648 c5 -2147483648 c6 -9223372036854775808 -c7 -9.22337e+18 -c8 -9.22337203685478e+18 -c9 -9.22337203685478e+18 -c10 -9.22337203685478e+18 +c7 -9.22337e18 +c8 -9.223372036854776e18 +c9 -9.223372036854776e18 +c10 -9.223372036854776e18 c12 -9999.9999 execute my_delete ; set @arg00= 1.11111111111111111111e+50 ; @@ -2662,10 +2662,10 @@ c3 8388607 c4 2147483647 c5 2147483647 c6 9223372036854775807 -c7 3.40282e+38 -c8 1.11111111111111e+50 -c9 1.11111111111111e+50 -c10 1.11111111111111e+50 +c7 3.40282e38 +c8 1.111111111111111e50 +c9 1.111111111111111e50 +c10 1.111111111111111e50 c12 9999.9999 execute my_delete ; set @arg00= '1.11111111111111111111e+50' ; @@ -2687,10 +2687,10 @@ c3 8388607 c4 2147483647 c5 2147483647 c6 9223372036854775807 -c7 3.40282e+38 -c8 1.11111111111111e+50 -c9 1.11111111111111e+50 -c10 1.11111111111111e+50 +c7 3.40282e38 +c8 1.111111111111111e50 +c9 1.111111111111111e50 +c10 1.111111111111111e50 c12 9999.9999 execute my_delete ; set @arg00= -1.11111111111111111111e+50 ; @@ -2712,10 +2712,10 @@ c3 -8388608 c4 -2147483648 c5 -2147483648 c6 -9223372036854775808 -c7 -3.40282e+38 -c8 -1.11111111111111e+50 -c9 -1.11111111111111e+50 -c10 -1.11111111111111e+50 +c7 -3.40282e38 +c8 -1.111111111111111e50 +c9 -1.111111111111111e50 +c10 -1.111111111111111e50 c12 -9999.9999 execute my_delete ; set @arg00= '-1.11111111111111111111e+50' ; @@ -2737,10 +2737,10 @@ c3 -8388608 c4 -2147483648 c5 -2147483648 c6 -9223372036854775808 -c7 -3.40282e+38 -c8 -1.11111111111111e+50 -c9 -1.11111111111111e+50 -c10 -1.11111111111111e+50 +c7 -3.40282e38 +c8 -1.111111111111111e50 +c9 -1.111111111111111e50 +c10 -1.111111111111111e50 c12 -9999.9999 execute my_delete ; test_sequence @@ -2805,10 +2805,10 @@ c1 c20 c21 c22 c23 c24 c25 c26 c27 c28 c29 c30 51 5 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0 52 5 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0 53 5 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0 -54 5 54 54 54.00 54.00 54.00 54.00 54.00 54.00 54.00 54.00 -55 5 55 55 55 55 55 55 55 55 55 55 -56 6 56 56 56.00 56.00 56.00 56.00 56.00 56.00 56.00 56.00 -57 6 57 57 57.00 57.00 57.00 57.00 57.00 57.00 57.00 57.00 +54 5 54 54 54 54 54 54 54 54 54 54 +55 6 55 55 55 55 55 55 55 55 55 55 +56 6 56 56 56 56 56 56 56 56 56 56 +57 6 57 57 57 57 57 57 57 57 57 57 60 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 61 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 62 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL @@ -3022,7 +3022,7 @@ c1 c13 c14 c15 c16 c17 42 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 43 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 50 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 -51 2010-00-00 2010-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 +51 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 52 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 53 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 60 NULL NULL 1991-01-01 01:01:01 NULL NULL diff --git a/mysql-test/r/ps_4heap.result b/mysql-test/r/ps_4heap.result index 4372c470b2d..84bf7a6fa00 100644 --- a/mysql-test/r/ps_4heap.result +++ b/mysql-test/r/ps_4heap.result @@ -2569,10 +2569,10 @@ c3 8388607 c4 2147483647 c5 2147483647 c6 9223372036854775807 -c7 9.22337e+18 -c8 9.22337203685478e+18 -c9 9.22337203685478e+18 -c10 9.22337203685478e+18 +c7 9.22337e18 +c8 9.223372036854776e18 +c9 9.223372036854776e18 +c10 9.223372036854776e18 c12 9999.9999 execute my_delete ; set @arg00= '9223372036854775807' ; @@ -2592,10 +2592,10 @@ c3 8388607 c4 2147483647 c5 2147483647 c6 9223372036854775807 -c7 9.22337e+18 -c8 9.22337203685478e+18 -c9 9.22337203685478e+18 -c10 9.22337203685478e+18 +c7 9.22337e18 +c8 9.223372036854776e18 +c9 9.223372036854776e18 +c10 9.223372036854776e18 c12 9999.9999 execute my_delete ; set @arg00= -9223372036854775808 ; @@ -2615,10 +2615,10 @@ c3 -8388608 c4 -2147483648 c5 -2147483648 c6 -9223372036854775808 -c7 -9.22337e+18 -c8 -9.22337203685478e+18 -c9 -9.22337203685478e+18 -c10 -9.22337203685478e+18 +c7 -9.22337e18 +c8 -9.223372036854776e18 +c9 -9.223372036854776e18 +c10 -9.223372036854776e18 c12 -9999.9999 execute my_delete ; set @arg00= '-9223372036854775808' ; @@ -2638,10 +2638,10 @@ c3 -8388608 c4 -2147483648 c5 -2147483648 c6 -9223372036854775808 -c7 -9.22337e+18 -c8 -9.22337203685478e+18 -c9 -9.22337203685478e+18 -c10 -9.22337203685478e+18 +c7 -9.22337e18 +c8 -9.223372036854776e18 +c9 -9.223372036854776e18 +c10 -9.223372036854776e18 c12 -9999.9999 execute my_delete ; set @arg00= 1.11111111111111111111e+50 ; @@ -2663,10 +2663,10 @@ c3 8388607 c4 2147483647 c5 2147483647 c6 9223372036854775807 -c7 3.40282e+38 -c8 1.11111111111111e+50 -c9 1.11111111111111e+50 -c10 1.11111111111111e+50 +c7 3.40282e38 +c8 1.111111111111111e50 +c9 1.111111111111111e50 +c10 1.111111111111111e50 c12 9999.9999 execute my_delete ; set @arg00= '1.11111111111111111111e+50' ; @@ -2688,10 +2688,10 @@ c3 8388607 c4 2147483647 c5 2147483647 c6 9223372036854775807 -c7 3.40282e+38 -c8 1.11111111111111e+50 -c9 1.11111111111111e+50 -c10 1.11111111111111e+50 +c7 3.40282e38 +c8 1.111111111111111e50 +c9 1.111111111111111e50 +c10 1.111111111111111e50 c12 9999.9999 execute my_delete ; set @arg00= -1.11111111111111111111e+50 ; @@ -2713,10 +2713,10 @@ c3 -8388608 c4 -2147483648 c5 -2147483648 c6 -9223372036854775808 -c7 -3.40282e+38 -c8 -1.11111111111111e+50 -c9 -1.11111111111111e+50 -c10 -1.11111111111111e+50 +c7 -3.40282e38 +c8 -1.111111111111111e50 +c9 -1.111111111111111e50 +c10 -1.111111111111111e50 c12 -9999.9999 execute my_delete ; set @arg00= '-1.11111111111111111111e+50' ; @@ -2738,10 +2738,10 @@ c3 -8388608 c4 -2147483648 c5 -2147483648 c6 -9223372036854775808 -c7 -3.40282e+38 -c8 -1.11111111111111e+50 -c9 -1.11111111111111e+50 -c10 -1.11111111111111e+50 +c7 -3.40282e38 +c8 -1.111111111111111e50 +c9 -1.111111111111111e50 +c10 -1.111111111111111e50 c12 -9999.9999 execute my_delete ; test_sequence @@ -2807,7 +2807,7 @@ c1 c20 c21 c22 c23 c24 c25 c26 c27 c28 c29 c30 52 5 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0 53 5 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0 54 5 54 54 54 54 54 54 54 54 54 54 -55 5 55 55 55 55 55 55 55 55 55 55 +55 6 55 55 55 55 55 55 55 55 55 55 56 6 56 56 56 56 56 56 56 56 56 56 57 6 57 57 57 57 57 57 57 57 57 57 60 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL @@ -3023,7 +3023,7 @@ c1 c13 c14 c15 c16 c17 42 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 43 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 50 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 -51 2010-00-00 2010-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 +51 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 52 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 53 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 60 NULL NULL 1991-01-01 01:01:01 NULL NULL diff --git a/mysql-test/r/ps_5merge.result b/mysql-test/r/ps_5merge.result index 35a43f7c032..61d2822fd5b 100644 --- a/mysql-test/r/ps_5merge.result +++ b/mysql-test/r/ps_5merge.result @@ -2505,10 +2505,10 @@ c3 8388607 c4 2147483647 c5 2147483647 c6 9223372036854775807 -c7 9.22337e+18 -c8 9.22337203685478e+18 -c9 9.22337203685478e+18 -c10 9.22337203685478e+18 +c7 9.22337e18 +c8 9.223372036854776e18 +c9 9.223372036854776e18 +c10 9.223372036854776e18 c12 9999.9999 execute my_delete ; set @arg00= '9223372036854775807' ; @@ -2528,10 +2528,10 @@ c3 8388607 c4 2147483647 c5 2147483647 c6 9223372036854775807 -c7 9.22337e+18 -c8 9.22337203685478e+18 -c9 9.22337203685478e+18 -c10 9.22337203685478e+18 +c7 9.22337e18 +c8 9.223372036854776e18 +c9 9.223372036854776e18 +c10 9.223372036854776e18 c12 9999.9999 execute my_delete ; set @arg00= -9223372036854775808 ; @@ -2551,10 +2551,10 @@ c3 -8388608 c4 -2147483648 c5 -2147483648 c6 -9223372036854775808 -c7 -9.22337e+18 -c8 -9.22337203685478e+18 -c9 -9.22337203685478e+18 -c10 -9.22337203685478e+18 +c7 -9.22337e18 +c8 -9.223372036854776e18 +c9 -9.223372036854776e18 +c10 -9.223372036854776e18 c12 -9999.9999 execute my_delete ; set @arg00= '-9223372036854775808' ; @@ -2574,10 +2574,10 @@ c3 -8388608 c4 -2147483648 c5 -2147483648 c6 -9223372036854775808 -c7 -9.22337e+18 -c8 -9.22337203685478e+18 -c9 -9.22337203685478e+18 -c10 -9.22337203685478e+18 +c7 -9.22337e18 +c8 -9.223372036854776e18 +c9 -9.223372036854776e18 +c10 -9.223372036854776e18 c12 -9999.9999 execute my_delete ; set @arg00= 1.11111111111111111111e+50 ; @@ -2599,10 +2599,10 @@ c3 8388607 c4 2147483647 c5 2147483647 c6 9223372036854775807 -c7 3.40282e+38 -c8 1.11111111111111e+50 -c9 1.11111111111111e+50 -c10 1.11111111111111e+50 +c7 3.40282e38 +c8 1.111111111111111e50 +c9 1.111111111111111e50 +c10 1.111111111111111e50 c12 9999.9999 execute my_delete ; set @arg00= '1.11111111111111111111e+50' ; @@ -2624,10 +2624,10 @@ c3 8388607 c4 2147483647 c5 2147483647 c6 9223372036854775807 -c7 3.40282e+38 -c8 1.11111111111111e+50 -c9 1.11111111111111e+50 -c10 1.11111111111111e+50 +c7 3.40282e38 +c8 1.111111111111111e50 +c9 1.111111111111111e50 +c10 1.111111111111111e50 c12 9999.9999 execute my_delete ; set @arg00= -1.11111111111111111111e+50 ; @@ -2649,10 +2649,10 @@ c3 -8388608 c4 -2147483648 c5 -2147483648 c6 -9223372036854775808 -c7 -3.40282e+38 -c8 -1.11111111111111e+50 -c9 -1.11111111111111e+50 -c10 -1.11111111111111e+50 +c7 -3.40282e38 +c8 -1.111111111111111e50 +c9 -1.111111111111111e50 +c10 -1.111111111111111e50 c12 -9999.9999 execute my_delete ; set @arg00= '-1.11111111111111111111e+50' ; @@ -2674,10 +2674,10 @@ c3 -8388608 c4 -2147483648 c5 -2147483648 c6 -9223372036854775808 -c7 -3.40282e+38 -c8 -1.11111111111111e+50 -c9 -1.11111111111111e+50 -c10 -1.11111111111111e+50 +c7 -3.40282e38 +c8 -1.111111111111111e50 +c9 -1.111111111111111e50 +c10 -1.111111111111111e50 c12 -9999.9999 execute my_delete ; test_sequence @@ -2742,10 +2742,10 @@ c1 c20 c21 c22 c23 c24 c25 c26 c27 c28 c29 c30 51 5 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0 52 5 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0 53 5 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0 -54 5 54 54 54.00 54.00 54.00 54.00 54.00 54.00 54.00 54.00 -55 5 55 55 55 55 55 55 55 55 55 55 -56 6 56 56 56.00 56.00 56.00 56.00 56.00 56.00 56.00 56.00 -57 6 57 57 57.00 57.00 57.00 57.00 57.00 57.00 57.00 57.00 +54 5 54 54 54 54 54 54 54 54 54 54 +55 6 55 55 55 55 55 55 55 55 55 55 +56 6 56 56 56 56 56 56 56 56 56 56 +57 6 57 57 57 57 57 57 57 57 57 57 60 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 61 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 62 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL @@ -2959,7 +2959,7 @@ c1 c13 c14 c15 c16 c17 42 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 43 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 50 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 -51 2010-00-00 2010-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 +51 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 52 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 53 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 60 NULL NULL 1991-01-01 01:01:01 NULL NULL @@ -5527,10 +5527,10 @@ c3 8388607 c4 2147483647 c5 2147483647 c6 9223372036854775807 -c7 9.22337e+18 -c8 9.22337203685478e+18 -c9 9.22337203685478e+18 -c10 9.22337203685478e+18 +c7 9.22337e18 +c8 9.223372036854776e18 +c9 9.223372036854776e18 +c10 9.223372036854776e18 c12 9999.9999 execute my_delete ; set @arg00= '9223372036854775807' ; @@ -5550,10 +5550,10 @@ c3 8388607 c4 2147483647 c5 2147483647 c6 9223372036854775807 -c7 9.22337e+18 -c8 9.22337203685478e+18 -c9 9.22337203685478e+18 -c10 9.22337203685478e+18 +c7 9.22337e18 +c8 9.223372036854776e18 +c9 9.223372036854776e18 +c10 9.223372036854776e18 c12 9999.9999 execute my_delete ; set @arg00= -9223372036854775808 ; @@ -5573,10 +5573,10 @@ c3 -8388608 c4 -2147483648 c5 -2147483648 c6 -9223372036854775808 -c7 -9.22337e+18 -c8 -9.22337203685478e+18 -c9 -9.22337203685478e+18 -c10 -9.22337203685478e+18 +c7 -9.22337e18 +c8 -9.223372036854776e18 +c9 -9.223372036854776e18 +c10 -9.223372036854776e18 c12 -9999.9999 execute my_delete ; set @arg00= '-9223372036854775808' ; @@ -5596,10 +5596,10 @@ c3 -8388608 c4 -2147483648 c5 -2147483648 c6 -9223372036854775808 -c7 -9.22337e+18 -c8 -9.22337203685478e+18 -c9 -9.22337203685478e+18 -c10 -9.22337203685478e+18 +c7 -9.22337e18 +c8 -9.223372036854776e18 +c9 -9.223372036854776e18 +c10 -9.223372036854776e18 c12 -9999.9999 execute my_delete ; set @arg00= 1.11111111111111111111e+50 ; @@ -5621,10 +5621,10 @@ c3 8388607 c4 2147483647 c5 2147483647 c6 9223372036854775807 -c7 3.40282e+38 -c8 1.11111111111111e+50 -c9 1.11111111111111e+50 -c10 1.11111111111111e+50 +c7 3.40282e38 +c8 1.111111111111111e50 +c9 1.111111111111111e50 +c10 1.111111111111111e50 c12 9999.9999 execute my_delete ; set @arg00= '1.11111111111111111111e+50' ; @@ -5646,10 +5646,10 @@ c3 8388607 c4 2147483647 c5 2147483647 c6 9223372036854775807 -c7 3.40282e+38 -c8 1.11111111111111e+50 -c9 1.11111111111111e+50 -c10 1.11111111111111e+50 +c7 3.40282e38 +c8 1.111111111111111e50 +c9 1.111111111111111e50 +c10 1.111111111111111e50 c12 9999.9999 execute my_delete ; set @arg00= -1.11111111111111111111e+50 ; @@ -5671,10 +5671,10 @@ c3 -8388608 c4 -2147483648 c5 -2147483648 c6 -9223372036854775808 -c7 -3.40282e+38 -c8 -1.11111111111111e+50 -c9 -1.11111111111111e+50 -c10 -1.11111111111111e+50 +c7 -3.40282e38 +c8 -1.111111111111111e50 +c9 -1.111111111111111e50 +c10 -1.111111111111111e50 c12 -9999.9999 execute my_delete ; set @arg00= '-1.11111111111111111111e+50' ; @@ -5696,10 +5696,10 @@ c3 -8388608 c4 -2147483648 c5 -2147483648 c6 -9223372036854775808 -c7 -3.40282e+38 -c8 -1.11111111111111e+50 -c9 -1.11111111111111e+50 -c10 -1.11111111111111e+50 +c7 -3.40282e38 +c8 -1.111111111111111e50 +c9 -1.111111111111111e50 +c10 -1.111111111111111e50 c12 -9999.9999 execute my_delete ; test_sequence @@ -5764,10 +5764,10 @@ c1 c20 c21 c22 c23 c24 c25 c26 c27 c28 c29 c30 51 5 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0 52 5 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0 53 5 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0 -54 5 54 54 54.00 54.00 54.00 54.00 54.00 54.00 54.00 54.00 -55 5 55 55 55 55 55 55 55 55 55 55 -56 6 56 56 56.00 56.00 56.00 56.00 56.00 56.00 56.00 56.00 -57 6 57 57 57.00 57.00 57.00 57.00 57.00 57.00 57.00 57.00 +54 5 54 54 54 54 54 54 54 54 54 54 +55 6 55 55 55 55 55 55 55 55 55 55 +56 6 56 56 56 56 56 56 56 56 56 56 +57 6 57 57 57 57 57 57 57 57 57 57 60 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 61 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 62 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL @@ -5981,7 +5981,7 @@ c1 c13 c14 c15 c16 c17 42 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 43 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 50 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 -51 2010-00-00 2010-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 +51 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 52 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 53 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 60 NULL NULL 1991-01-01 01:01:01 NULL NULL diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result index ff2dd49e725..41dd44fc4d0 100644 --- a/mysql-test/r/select.result +++ b/mysql-test/r/select.result @@ -2784,26 +2784,26 @@ id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE NULL NULL NULL NULL NULL NULL NULL Select tables optimized away select max(key1) from t1 where key1 <= 0.6158; max(key1) -0.615800023078918 +0.6158000230789185 select max(key2) from t2 where key2 <= 1.6158; max(key2) -1.61580002307892 +1.6158000230789185 select min(key1) from t1 where key1 >= 0.3762; min(key1) -0.376199990510941 +0.37619999051094055 select min(key2) from t2 where key2 >= 1.3762; min(key2) -1.37619996070862 +1.3761999607086182 select max(key1), min(key2) from t1, t2 where key1 <= 0.6158 and key2 >= 1.3762; max(key1) min(key2) -0.615800023078918 1.37619996070862 +0.6158000230789185 1.3761999607086182 select max(key1) from t1 where key1 <= 0.6158 and rand() + 0.5 >= 0.5; max(key1) -0.615800023078918 +0.6158000230789185 select min(key1) from t1 where key1 >= 0.3762 and rand() + 0.5 >= 0.5; min(key1) -0.376199990510941 +0.37619999051094055 DROP TABLE t1,t2; CREATE TABLE t1 (i BIGINT UNSIGNED NOT NULL); INSERT INTO t1 VALUES (10); diff --git a/mysql-test/r/sp.result b/mysql-test/r/sp.result index ac118d0bab2..b4af25efc1b 100644 --- a/mysql-test/r/sp.result +++ b/mysql-test/r/sp.result @@ -579,7 +579,7 @@ return 2.7182818284590452354| set @e = e()| select e(), @e| e() @e -2.71828182845905 2.71828182845905 +2.718281828459045 2.718281828459045 drop function if exists inc| create function inc(i int) returns int return i+1| @@ -616,23 +616,23 @@ create function fun(d double, i int, u int unsigned) returns double return mul(inc(i), fac(u)) / e()| select fun(2.3, 3, 5)| fun(2.3, 3, 5) -176.582131762292 +176.58213176229233 insert into t2 values (append("xxx", "yyy"), mul(4,3), e())| insert into t2 values (append("a", "b"), mul(2,mul(3,4)), fun(1.7, 4, 6))| select * from t2 where s = append("a", "b")| s i d -ab 24 1324.36598821719 +ab 24 1324.3659882171924 select * from t2 where i = mul(4,3) or i = mul(mul(3,4),2) order by i| s i d -xxxyyy 12 2.71828182845905 -ab 24 1324.36598821719 +xxxyyy 12 2.718281828459045 +ab 24 1324.3659882171924 select * from t2 where d = e()| s i d -xxxyyy 12 2.71828182845905 +xxxyyy 12 2.718281828459045 select * from t2 order by i| s i d -xxxyyy 12 2.71828182845905 -ab 24 1324.36598821719 +xxxyyy 12 2.718281828459045 +ab 24 1324.3659882171924 delete from t2| drop function e| drop function inc| @@ -5972,9 +5972,9 @@ CREATE TABLE t3 (f1 INT, f2 FLOAT)| INSERT INTO t3 VALUES (1, 3.4), (1, 2), (1, 0.9), (2, 8), (2, 7)| SELECT SUM(f2), bug25373(f1) FROM t3 GROUP BY bug25373(f1) WITH ROLLUP| SUM(f2) bug25373(f1) -6.30000007152557 1 +6.300000071525574 1 15 2 -21.3000000715256 NULL +21.300000071525574 NULL DROP FUNCTION bug25373| DROP TABLE t3| DROP DATABASE IF EXISTS mysqltest1| diff --git a/mysql-test/r/strict.result b/mysql-test/r/strict.result index 897c9072203..bdb7576f95e 100644 --- a/mysql-test/r/strict.result +++ b/mysql-test/r/strict.result @@ -873,14 +873,14 @@ Warning 1264 Out of range value for column 'col2' at row 1 SELECT * FROM t1; col1 col2 -1.1e-37 0 -3.4e+38 3.4e+38 +3.4e38 3.4e38 -1.1e-37 0 -3.4e+38 3.4e+38 +3.4e38 3.4e38 0 NULL 2 NULL NULL NULL -3.40282e+38 0 -3.40282e+38 0 +3.40282e38 0 +3.40282e38 0 DROP TABLE t1; CREATE TABLE t1 (col1 DOUBLE PRECISION, col2 DOUBLE PRECISION UNSIGNED); INSERT INTO t1 VALUES (-2.2E-307,0),(2E-307,0),(+1.7E+308,+1.7E+308); @@ -922,14 +922,14 @@ SELECT * FROM t1; col1 col2 -2.2e-307 0 1e-303 0 -NULL 1.7e+308 +NULL 1.7e308 -2.2e-307 0 -2e-307 0 -NULL 1.7e+308 +NULL 1.7e308 0 NULL 2 NULL NULL NULL -1.79769313486232e+308 0 +1.7976931348623157e308 0 DROP TABLE t1; CREATE TABLE t1 (col1 CHAR(5), col2 VARCHAR(6)); INSERT INTO t1 VALUES ('hello', 'hello'),('he', 'he'),('hello ', 'hello '); diff --git a/mysql-test/r/type_decimal.result b/mysql-test/r/type_decimal.result index 67898b7f335..d131fa2b4d5 100644 --- a/mysql-test/r/type_decimal.result +++ b/mysql-test/r/type_decimal.result @@ -796,6 +796,18 @@ SELECT ROUND(qty,3), dps, ROUND(qty,dps) FROM t1; ROUND(qty,3) dps ROUND(qty,dps) 1.133 3 1.133000 DROP TABLE t1; +create table t1 (c1 decimal(10,6)); +insert into t1 (c1) values (9.99e-4); +insert into t1 (c1) values (9.98e-4); +insert into t1 (c1) values (0.000999); +insert into t1 (c1) values (cast(9.99e-4 as decimal(10,6))); +select * from t1; +c1 +0.000999 +0.000998 +0.000999 +0.000999 +drop table t1; SELECT 1 % .123456789123456789123456789123456789123456789123456789123456789123456789123456789 AS '%'; % 0.012345687012345687012345687012345687012345687012345687012345687012345687000000000 diff --git a/mysql-test/r/type_float.result b/mysql-test/r/type_float.result index a3a13bb0435..546e281ee67 100644 --- a/mysql-test/r/type_float.result +++ b/mysql-test/r/type_float.result @@ -2,9 +2,9 @@ drop table if exists t1,t2; SELECT 10,10.0,10.,.1e+2,100.0e-1; 10 10.0 10. .1e+2 100.0e-1 10 10.0 10 10 10 -SELECT 6e-05, -6e-05, --6e-05, -6e-05+1.000000; -6e-05 -6e-05 --6e-05 -6e-05+1.000000 -6e-05 -6e-05 6e-05 0.99994 +SELECT 6e-16, -6e-16, --6e-16, -6e-16+1.000000; +6e-16 -6e-16 --6e-16 -6e-16+1.000000 +6e-16 -6e-16 6e-16 0.9999999999999994 SELECT 1e1,1.e1,1.0e1,1e+1,1.e+1,1.0e+1,1e-1,1.e-1,1.0e-1; 1e1 1.e1 1.0e1 1e+1 1.e+1 1.0e+1 1e-1 1.e-1 1.0e-1 10 10 10 10 10 10 0.1 0.1 0.1 @@ -31,16 +31,16 @@ select * from t1; f1 f2 10 10 100000 100000 -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 +1234570000 1234567890 +10000000000 10000000000 +1e15 1e15 +1e20 1e20 +3.40282e38 1e50 +3.40282e38 1e150 -10 -10 -1e-05 1e-05 -1e-10 1e-10 -1e-15 1e-15 +0.00001 0.00001 +0.0000000001 0.0000000001 +0.000000000000001 0.000000000000001 1e-20 1e-20 0 1e-50 0 1e-150 @@ -87,7 +87,7 @@ col create table t2 select c1 + c1 * (c2 / 100) as col1, round(c1, 5) as col2, round(c1, 35) as col3, sqrt(c1*1e-15) col4 from t1; select * from t2; col1 col2 col3 col4 -140.36 121.00000 121 3.47850542618522e-07 +140.36 121.00000 121 0.00000034785054261852176 show create table t2; Table Create Table t2 CREATE TABLE `t2` ( @@ -201,9 +201,9 @@ insert into t1 values (2e5),(2e6),(2e-4),(2e-5); select * from t1; c 200000 -2e+06 +2e6 0.0002 -2e-05 +2e-5 drop table t1; CREATE TABLE t1 ( reckey int unsigned NOT NULL, @@ -267,7 +267,7 @@ select 1e-308, 1.00000001e-300, 100000000e-300; 1e-308 1.00000001e-300 1e-292 select 10e307; 10e307 -1e+308 +1e308 create table t1(a int, b double(8, 2)); insert into t1 values (1, 28.50), (1, 121.85), (1, 157.23), (1, 1351.00), (1, -1965.35), (1, 81.75), @@ -369,12 +369,12 @@ Warning 1264 Out of range value for column 'f1' at row 1 Warning 1264 Out of range value for column 'f1' at row 2 select f1 + 0e0 from t1; f1 + 0e0 -1e+199 --1e+199 -1e+200 --1e+200 -1e+200 --1e+200 +1e199 +-1e199 +1e200 +-1e200 +1e200 +-1e200 drop table t1; create table t1 (f1 float(30, 0)); insert into t1 values (1e29), (-1e29); @@ -385,12 +385,36 @@ Warning 1264 Out of range value for column 'f1' at row 1 Warning 1264 Out of range value for column 'f1' at row 2 select f1 + 0e0 from t1; f1 + 0e0 -1.00000001504747e+29 --1.00000001504747e+29 -1.00000001504747e+30 --1.00000001504747e+30 -1.00000001504747e+30 --1.00000001504747e+30 +1.0000000150474662e29 +-1.0000000150474662e29 +1.0000000150474662e30 +-1.0000000150474662e30 +1.0000000150474662e30 +-1.0000000150474662e30 +drop table t1; +create table t1 (c char(6)); +insert into t1 values (2e6),(2e-5); +select * from t1; +c +2e6 +2e-5 +drop table t1; +CREATE TABLE d1 (d DOUBLE); +INSERT INTO d1 VALUES (1.7976931348623157E+308); +SELECT * FROM d1; +d +1.7976931348623157e308 +INSERT INTO d1 VALUES (1.79769313486232e+308); +ERROR 22007: Illegal double '1.79769313486232e+308' value found during parsing +SELECT * FROM d1; +d +1.7976931348623157e308 +DROP TABLE d1; +create table t1 (a char(20)); +insert into t1 values (1.225e-05); +select a+0 from t1; +a+0 +0.00001225 drop table t1; create table t1(d double, u bigint unsigned); insert into t1(d) values (9.22337203685479e18), @@ -405,6 +429,6 @@ CREATE TABLE t1 (f1 DOUBLE); INSERT INTO t1 VALUES(-1.79769313486231e+308); SELECT f1 FROM t1; f1 --1.79769313486231e+308 +-1.79769313486231e308 DROP TABLE t1; End of 5.0 tests diff --git a/mysql-test/r/type_newdecimal.result b/mysql-test/r/type_newdecimal.result index 172b343e003..00526597a32 100644 --- a/mysql-test/r/type_newdecimal.result +++ b/mysql-test/r/type_newdecimal.result @@ -917,7 +917,7 @@ cast('1.00000001335143196001808973960578441619873046875E-10' as decimal(30,15)) 0.000000000100000 select ln(14000) c1, convert(ln(14000),decimal(5,3)) c2, cast(ln(14000) as decimal(5,3)) c3; c1 c2 c3 -9.5468126085974 9.547 9.547 +9.546812608597396 9.547 9.547 select convert(ln(14000),decimal(2,3)) c1; ERROR 42000: For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column ''). select cast(ln(14000) as decimal(2,3)) c1; @@ -1141,17 +1141,17 @@ my_float my_double my_varchar 1.17549e-18 1.175494345e-18 1.175494345e-18 1.17549e-17 1.175494345e-17 1.175494345e-17 1.17549e-16 1.175494345e-16 1.175494345e-16 -1.17549e-15 1.175494345e-15 1.175494345e-15 -1.17549e-14 1.175494345e-14 1.175494345e-14 -1.17549e-13 1.175494345e-13 1.175494345e-13 -1.17549e-12 1.175494345e-12 1.175494345e-12 -1.17549e-11 1.175494345e-11 1.175494345e-11 -1.17549e-10 1.175494345e-10 1.175494345e-10 -1.17549e-09 1.175494345e-09 1.175494345e-9 -1.17549e-08 1.175494345e-08 1.175494345e-8 -1.17549e-07 1.175494345e-07 1.175494345e-7 -1.17549e-06 1.175494345e-06 1.175494345e-6 -1.17549e-05 1.175494345e-05 1.175494345e-5 +0.00000000000000117549 0.000000000000001175494345 1.175494345e-15 +0.0000000000000117549 0.00000000000001175494345 1.175494345e-14 +0.000000000000117549 0.0000000000001175494345 1.175494345e-13 +0.00000000000117549 0.000000000001175494345 1.175494345e-12 +0.0000000000117549 0.00000000001175494345 1.175494345e-11 +0.000000000117549 0.0000000001175494345 1.175494345e-10 +0.00000000117549 0.000000001175494345 1.175494345e-9 +0.0000000117549 0.00000001175494345 1.175494345e-8 +0.000000117549 0.0000001175494345 1.175494345e-7 +0.00000117549 0.000001175494345 1.175494345e-6 +0.0000117549 0.00001175494345 1.175494345e-5 0.000117549 0.0001175494345 1.175494345e-4 0.00117549 0.001175494345 1.175494345e-3 0.0117549 0.01175494345 1.175494345e-2 @@ -1175,21 +1175,21 @@ CAST(my_float AS DECIMAL(65,30)) my_float 0.000000000000000001175494374380 1.17549e-18 0.000000000000000011754943743802 1.17549e-17 0.000000000000000117549432474939 1.17549e-16 -0.000000000000001175494324749389 1.17549e-15 -0.000000000000011754943671010360 1.17549e-14 -0.000000000000117549429933840000 1.17549e-13 -0.000000000001175494380653563000 1.17549e-12 -0.000000000011754943372854760000 1.17549e-11 -0.000000000117549428524377200000 1.17549e-10 -0.000000001175494368510499000000 1.17549e-09 -0.000000011754943685104990000000 1.17549e-08 -0.000000117549433298336200000000 1.17549e-07 -0.000001175494389826781000000000 1.17549e-06 -0.000011754943443520460000000000 1.17549e-05 +0.000000000000001175494324749389 0.00000000000000117549 +0.000000000000011754943671010362 0.0000000000000117549 +0.000000000000117549429933840040 0.000000000000117549 +0.000000000001175494380653563400 0.00000000000117549 +0.000000000011754943372854765000 0.0000000000117549 +0.000000000117549428524377220000 0.000000000117549 +0.000000001175494368510499000000 0.00000000117549 +0.000000011754943685104990000000 0.0000000117549 +0.000000117549433298336230000000 0.000000117549 +0.000001175494389826781100000000 0.00000117549 +0.000011754943443520460000000000 0.0000117549 0.000117549432616215200000000000 0.000117549 -0.001175494398921728000000000000 0.00117549 -0.011754943057894710000000000000 0.0117549 -0.117549434304237400000000000000 0.117549 +0.001175494398921728100000000000 0.00117549 +0.011754943057894707000000000000 0.0117549 +0.117549434304237370000000000000 0.117549 SELECT CAST(my_double AS DECIMAL(65,30)), my_double FROM t1; CAST(my_double AS DECIMAL(65,30)) my_double 0.000000000000000000000000000000 1.175494345e-32 @@ -1209,17 +1209,17 @@ CAST(my_double AS DECIMAL(65,30)) my_double 0.000000000000000001175494345000 1.175494345e-18 0.000000000000000011754943450000 1.175494345e-17 0.000000000000000117549434500000 1.175494345e-16 -0.000000000000001175494345000000 1.175494345e-15 -0.000000000000011754943450000000 1.175494345e-14 -0.000000000000117549434500000000 1.175494345e-13 -0.000000000001175494345000000000 1.175494345e-12 -0.000000000011754943450000000000 1.175494345e-11 -0.000000000117549434500000000000 1.175494345e-10 -0.000000001175494345000000000000 1.175494345e-09 -0.000000011754943450000000000000 1.175494345e-08 -0.000000117549434500000000000000 1.175494345e-07 -0.000001175494345000000000000000 1.175494345e-06 -0.000011754943450000000000000000 1.175494345e-05 +0.000000000000001175494345000000 0.000000000000001175494345 +0.000000000000011754943450000000 0.00000000000001175494345 +0.000000000000117549434500000000 0.0000000000001175494345 +0.000000000001175494345000000000 0.000000000001175494345 +0.000000000011754943450000000000 0.00000000001175494345 +0.000000000117549434500000000000 0.0000000001175494345 +0.000000001175494345000000000000 0.000000001175494345 +0.000000011754943450000000000000 0.00000001175494345 +0.000000117549434500000000000000 0.0000001175494345 +0.000001175494345000000000000000 0.000001175494345 +0.000011754943450000000000000000 0.00001175494345 0.000117549434500000000000000000 0.0001175494345 0.001175494345000000000000000000 0.001175494345 0.011754943450000000000000000000 0.01175494345 @@ -1278,21 +1278,21 @@ my_decimal my_float 0.000000000000000001175494374380 1.17549e-18 0.000000000000000011754943743802 1.17549e-17 0.000000000000000117549432474939 1.17549e-16 -0.000000000000001175494324749389 1.17549e-15 -0.000000000000011754943671010360 1.17549e-14 -0.000000000000117549429933840000 1.17549e-13 -0.000000000001175494380653563000 1.17549e-12 -0.000000000011754943372854760000 1.17549e-11 -0.000000000117549428524377200000 1.17549e-10 -0.000000001175494368510499000000 1.17549e-09 -0.000000011754943685104990000000 1.17549e-08 -0.000000117549433298336200000000 1.17549e-07 -0.000001175494389826781000000000 1.17549e-06 -0.000011754943443520460000000000 1.17549e-05 +0.000000000000001175494324749389 0.00000000000000117549 +0.000000000000011754943671010362 0.0000000000000117549 +0.000000000000117549429933840040 0.000000000000117549 +0.000000000001175494380653563400 0.00000000000117549 +0.000000000011754943372854765000 0.0000000000117549 +0.000000000117549428524377220000 0.000000000117549 +0.000000001175494368510499000000 0.00000000117549 +0.000000011754943685104990000000 0.0000000117549 +0.000000117549433298336230000000 0.000000117549 +0.000001175494389826781100000000 0.00000117549 +0.000011754943443520460000000000 0.0000117549 0.000117549432616215200000000000 0.000117549 -0.001175494398921728000000000000 0.00117549 -0.011754943057894710000000000000 0.0117549 -0.117549434304237400000000000000 0.117549 +0.001175494398921728100000000000 0.00117549 +0.011754943057894707000000000000 0.0117549 +0.117549434304237370000000000000 0.117549 UPDATE t1 SET my_decimal = my_double; SELECT my_decimal, my_double FROM t1; my_decimal my_double @@ -1313,17 +1313,17 @@ my_decimal my_double 0.000000000000000001175494345000 1.175494345e-18 0.000000000000000011754943450000 1.175494345e-17 0.000000000000000117549434500000 1.175494345e-16 -0.000000000000001175494345000000 1.175494345e-15 -0.000000000000011754943450000000 1.175494345e-14 -0.000000000000117549434500000000 1.175494345e-13 -0.000000000001175494345000000000 1.175494345e-12 -0.000000000011754943450000000000 1.175494345e-11 -0.000000000117549434500000000000 1.175494345e-10 -0.000000001175494345000000000000 1.175494345e-09 -0.000000011754943450000000000000 1.175494345e-08 -0.000000117549434500000000000000 1.175494345e-07 -0.000001175494345000000000000000 1.175494345e-06 -0.000011754943450000000000000000 1.175494345e-05 +0.000000000000001175494345000000 0.000000000000001175494345 +0.000000000000011754943450000000 0.00000000000001175494345 +0.000000000000117549434500000000 0.0000000000001175494345 +0.000000000001175494345000000000 0.000000000001175494345 +0.000000000011754943450000000000 0.00000000001175494345 +0.000000000117549434500000000000 0.0000000001175494345 +0.000000001175494345000000000000 0.000000001175494345 +0.000000011754943450000000000000 0.00000001175494345 +0.000000117549434500000000000000 0.0000001175494345 +0.000001175494345000000000000000 0.000001175494345 +0.000011754943450000000000000000 0.00001175494345 0.000117549434500000000000000000 0.0001175494345 0.001175494345000000000000000000 0.001175494345 0.011754943450000000000000000000 0.01175494345 diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result index f98872d93b3..95e374cc384 100644 --- a/mysql-test/r/variables.result +++ b/mysql-test/r/variables.result @@ -57,7 +57,7 @@ select @`select`,@not_used; set @test_int=10,@test_double=1e-10,@test_string="abcdeghi",@test_string2="abcdefghij",@select=NULL; select @test_int,@test_double,@test_string,@test_string2,@select; @test_int @test_double @test_string @test_string2 @select -10 1e-10 abcdeghi abcdefghij NULL +10 0.0000000001 abcdeghi abcdefghij NULL set @test_int="hello",@test_double="hello",@test_string="hello",@test_string2="hello"; select @test_int,@test_double,@test_string,@test_string2; @test_int @test_double @test_string @test_string2 diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result index b10c542f644..a54db7240a4 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -2590,7 +2590,7 @@ CREATE VIEW v1 AS SELECT SQRT(a) my_sqrt FROM t1; SELECT my_sqrt FROM v1 ORDER BY my_sqrt; my_sqrt 1 -1.4142135623731 +1.4142135623730951 DROP VIEW v1; DROP TABLE t1; CREATE TABLE t1 (id int PRIMARY KEY); diff --git a/mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.1.Data b/mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.1.Data Binary files differindex 2df8080956a..267039d757e 100644 --- a/mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.1.Data +++ b/mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.1.Data diff --git a/mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.2.Data b/mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.2.Data Binary files differindex 2c6f93e93b6..067fc6b716d 100644 --- a/mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.2.Data +++ b/mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.2.Data diff --git a/mysql-test/suite/ndb/r/ndb_gis.result b/mysql-test/suite/ndb/r/ndb_gis.result index 61d15b7cb98..54772f596c3 100644 --- a/mysql-test/suite/ndb/r/ndb_gis.result +++ b/mysql-test/suite/ndb/r/ndb_gis.result @@ -266,7 +266,7 @@ fid AsText(EndPoint(g)) 107 POINT(40 10) SELECT fid, GLength(g) FROM gis_line ORDER by fid; fid GLength(g) -105 24.142135623731 +105 24.14213562373095 106 40 107 30 SELECT fid, NumPoints(g) FROM gis_line ORDER by fid; @@ -292,7 +292,7 @@ Note 1003 select astext(startpoint(`test`.`gis_line`.`g`)) AS `AsText(StartPoint SELECT fid, AsText(Centroid(g)) FROM gis_polygon ORDER by fid; fid AsText(Centroid(g)) 108 POINT(15 15) -109 POINT(25.4166666666667 25.4166666666667) +109 POINT(25.416666666666668 25.416666666666668) 110 POINT(20 10) SELECT fid, Area(g) FROM gis_polygon ORDER by fid; fid Area(g) @@ -326,8 +326,8 @@ fid IsClosed(g) 116 0 SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon ORDER by fid; fid AsText(Centroid(g)) -117 POINT(55.5885277530424 17.426536064114) -118 POINT(55.5885277530424 17.426536064114) +117 POINT(55.58852775304245 17.426536064113982) +118 POINT(55.58852775304245 17.426536064113982) 119 POINT(2 2) SELECT fid, Area(g) FROM gis_multi_polygon ORDER by fid; fid Area(g) @@ -816,7 +816,7 @@ fid AsText(EndPoint(g)) 107 POINT(40 10) SELECT fid, GLength(g) FROM gis_line ORDER by fid; fid GLength(g) -105 24.142135623731 +105 24.14213562373095 106 40 107 30 SELECT fid, NumPoints(g) FROM gis_line ORDER by fid; @@ -842,7 +842,7 @@ Note 1003 select astext(startpoint(`test`.`gis_line`.`g`)) AS `AsText(StartPoint SELECT fid, AsText(Centroid(g)) FROM gis_polygon ORDER by fid; fid AsText(Centroid(g)) 108 POINT(15 15) -109 POINT(25.4166666666667 25.4166666666667) +109 POINT(25.416666666666668 25.416666666666668) 110 POINT(20 10) SELECT fid, Area(g) FROM gis_polygon ORDER by fid; fid Area(g) @@ -876,8 +876,8 @@ fid IsClosed(g) 116 0 SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon ORDER by fid; fid AsText(Centroid(g)) -117 POINT(55.5885277530424 17.426536064114) -118 POINT(55.5885277530424 17.426536064114) +117 POINT(55.58852775304245 17.426536064113982) +118 POINT(55.58852775304245 17.426536064113982) 119 POINT(2 2) SELECT fid, Area(g) FROM gis_multi_polygon ORDER by fid; fid Area(g) diff --git a/mysql-test/suite/ndb/r/ndb_restore_different_endian_data.result b/mysql-test/suite/ndb/r/ndb_restore_different_endian_data.result index e552de8d854..b101c93d156 100644 --- a/mysql-test/suite/ndb/r/ndb_restore_different_endian_data.result +++ b/mysql-test/suite/ndb/r/ndb_restore_different_endian_data.result @@ -79,7 +79,7 @@ t_pk t_date t_datetime t_timestamp t_time t_year 1 1998-01-01 2006-08-10 10:11:12 2002-10-29 16:51:06 19:38:34 2155 SELECT t_pk,hex(t_bit),t_tinyint,t_bool,t_smallint,t_mediumint,t_int,t_bigint,t_float,t_double,t_decimal FROM t_num; t_pk hex(t_bit) t_tinyint t_bool t_smallint t_mediumint t_int t_bigint t_float t_double t_decimal -1 AAAAAAAAAAAAAAAA 125 1 32765 8388606 2147483647 9223372036854775807 1e+20 1e+150 331.0000000000000000 +1 AAAAAAAAAAAAAAAA 125 1 32765 8388606 2147483647 9223372036854775807 1e20 1e150 331.0000000000000000 SELECT t_pk,t_char,t_varchar,hex(t_binary),hex(t_varbinary) FROM t_string_1; t_pk t_char t_varchar hex(t_binary) hex(t_varbinary) 1 abcdefghijklmn abcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmn 612020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 4100 @@ -178,7 +178,7 @@ t_pk t_date t_datetime t_timestamp t_time t_year 1 1998-01-01 2006-08-10 10:11:12 2002-10-29 16:51:06 19:38:34 2155 SELECT t_pk,hex(t_bit),t_tinyint,t_bool,t_smallint,t_mediumint,t_int,t_bigint,t_float,t_double,t_decimal FROM t_num; t_pk hex(t_bit) t_tinyint t_bool t_smallint t_mediumint t_int t_bigint t_float t_double t_decimal -1 AAAAAAAAAAAAAAAA 125 1 32765 8388606 2147483647 9223372036854775807 1e+20 1e+150 331.0000000000000000 +1 AAAAAAAAAAAAAAAA 125 1 32765 8388606 2147483647 9223372036854775807 1e20 1e150 331.0000000000000000 SELECT t_pk,t_char,t_varchar,hex(t_binary),hex(t_varbinary) FROM t_string_1; t_pk t_char t_varchar hex(t_binary) hex(t_varbinary) 1 abcdefghijklmn abcdefghijklmnabcdefghijklmnabcdefghijklmnabcdefghijklmn 612020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 4100 diff --git a/mysql-test/suite/ndb/r/ps_7ndb.result b/mysql-test/suite/ndb/r/ps_7ndb.result index e57fdcb6df6..fcb2d641cf0 100644 --- a/mysql-test/suite/ndb/r/ps_7ndb.result +++ b/mysql-test/suite/ndb/r/ps_7ndb.result @@ -2568,10 +2568,10 @@ c3 8388607 c4 2147483647 c5 2147483647 c6 9223372036854775807 -c7 9.22337e+18 -c8 9.22337203685478e+18 -c9 9.22337203685478e+18 -c10 9.22337203685478e+18 +c7 9.22337e18 +c8 9.223372036854776e18 +c9 9.223372036854776e18 +c10 9.223372036854776e18 c12 9999.9999 execute my_delete ; set @arg00= '9223372036854775807' ; @@ -2591,10 +2591,10 @@ c3 8388607 c4 2147483647 c5 2147483647 c6 9223372036854775807 -c7 9.22337e+18 -c8 9.22337203685478e+18 -c9 9.22337203685478e+18 -c10 9.22337203685478e+18 +c7 9.22337e18 +c8 9.223372036854776e18 +c9 9.223372036854776e18 +c10 9.223372036854776e18 c12 9999.9999 execute my_delete ; set @arg00= -9223372036854775808 ; @@ -2614,10 +2614,10 @@ c3 -8388608 c4 -2147483648 c5 -2147483648 c6 -9223372036854775808 -c7 -9.22337e+18 -c8 -9.22337203685478e+18 -c9 -9.22337203685478e+18 -c10 -9.22337203685478e+18 +c7 -9.22337e18 +c8 -9.223372036854776e18 +c9 -9.223372036854776e18 +c10 -9.223372036854776e18 c12 -9999.9999 execute my_delete ; set @arg00= '-9223372036854775808' ; @@ -2637,10 +2637,10 @@ c3 -8388608 c4 -2147483648 c5 -2147483648 c6 -9223372036854775808 -c7 -9.22337e+18 -c8 -9.22337203685478e+18 -c9 -9.22337203685478e+18 -c10 -9.22337203685478e+18 +c7 -9.22337e18 +c8 -9.223372036854776e18 +c9 -9.223372036854776e18 +c10 -9.223372036854776e18 c12 -9999.9999 execute my_delete ; set @arg00= 1.11111111111111111111e+50 ; @@ -2662,10 +2662,10 @@ c3 8388607 c4 2147483647 c5 2147483647 c6 9223372036854775807 -c7 3.40282e+38 -c8 1.11111111111111e+50 -c9 1.11111111111111e+50 -c10 1.11111111111111e+50 +c7 3.40282e38 +c8 1.111111111111111e50 +c9 1.111111111111111e50 +c10 1.111111111111111e50 c12 9999.9999 execute my_delete ; set @arg00= '1.11111111111111111111e+50' ; @@ -2687,10 +2687,10 @@ c3 8388607 c4 2147483647 c5 2147483647 c6 9223372036854775807 -c7 3.40282e+38 -c8 1.11111111111111e+50 -c9 1.11111111111111e+50 -c10 1.11111111111111e+50 +c7 3.40282e38 +c8 1.111111111111111e50 +c9 1.111111111111111e50 +c10 1.111111111111111e50 c12 9999.9999 execute my_delete ; set @arg00= -1.11111111111111111111e+50 ; @@ -2712,10 +2712,10 @@ c3 -8388608 c4 -2147483648 c5 -2147483648 c6 -9223372036854775808 -c7 -3.40282e+38 -c8 -1.11111111111111e+50 -c9 -1.11111111111111e+50 -c10 -1.11111111111111e+50 +c7 -3.40282e38 +c8 -1.111111111111111e50 +c9 -1.111111111111111e50 +c10 -1.111111111111111e50 c12 -9999.9999 execute my_delete ; set @arg00= '-1.11111111111111111111e+50' ; @@ -2737,10 +2737,10 @@ c3 -8388608 c4 -2147483648 c5 -2147483648 c6 -9223372036854775808 -c7 -3.40282e+38 -c8 -1.11111111111111e+50 -c9 -1.11111111111111e+50 -c10 -1.11111111111111e+50 +c7 -3.40282e38 +c8 -1.111111111111111e50 +c9 -1.111111111111111e50 +c10 -1.111111111111111e50 c12 -9999.9999 execute my_delete ; test_sequence @@ -2805,10 +2805,10 @@ c1 c20 c21 c22 c23 c24 c25 c26 c27 c28 c29 c30 51 5 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0 51.0 52 5 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0 52.0 53 5 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0 53.0 -54 5 54 54 54.00 54.00 54.00 54.00 54.00 54.00 54.00 54.00 -55 5 55 55 55 55 55 55 55 55 55 55 -56 6 56 56 56.00 56.00 56.00 56.00 56.00 56.00 56.00 56.00 -57 6 57 57 57.00 57.00 57.00 57.00 57.00 57.00 57.00 57.00 +54 5 54 54 54 54 54 54 54 54 54 54 +55 6 55 55 55 55 55 55 55 55 55 55 +56 6 56 56 56 56 56 56 56 56 56 56 +57 6 57 57 57 57 57 57 57 57 57 57 60 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 61 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL 62 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL @@ -3022,7 +3022,7 @@ c1 c13 c14 c15 c16 c17 42 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 43 0000-00-00 0000-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 50 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 -51 2010-00-00 2010-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 +51 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 52 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 53 2001-00-00 2001-00-00 00:00:00 0000-00-00 00:00:00 838:59:59 0000 60 NULL NULL 1991-01-01 01:01:01 NULL NULL diff --git a/mysql-test/t/cast.test b/mysql-test/t/cast.test index 8e60d548c2f..f5426f8d631 100644 --- a/mysql-test/t/cast.test +++ b/mysql-test/t/cast.test @@ -177,8 +177,6 @@ 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/gis.test b/mysql-test/t/gis.test index bc0695aaa93..70d73234ea8 100644 --- a/mysql-test/t/gis.test +++ b/mysql-test/t/gis.test @@ -353,6 +353,9 @@ insert into t1 values ('85984',GeomFromText('MULTIPOLYGON(((-115.006363 36.248666,-115.263639 36.247466,-115.263839 36.252766,-115.261439 36.252666,-115.261439 36.247366,-115.247239 36.247066)))')); +# Expected result is 115.31877315203187, but IA64 returns 115.31877315203188 +# due to fused multiply-add instructions. +--replace_result 115.31877315203188 115.31877315203187 select object_id, geometrytype(geo), ISSIMPLE(GEO), ASTEXT(centroid(geo)) from t1 where object_id=85998; diff --git a/mysql-test/t/insert.test b/mysql-test/t/insert.test index 40d1464b86a..4f918504597 100644 --- a/mysql-test/t/insert.test +++ b/mysql-test/t/insert.test @@ -422,9 +422,6 @@ 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; @@ -459,9 +456,6 @@ 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; diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index 07ab9cecd28..94b209305f6 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -46,9 +46,6 @@ DROP TABLE t1; CREATE TABLE t1 (a double); INSERT INTO t1 VALUES ('-9e999999'); -# The following replaces is here because some systems replaces the above -# double with '-inf' and others with MAX_DOUBLE ---replace_result (-1.79769313486232e+308) (RES) (NULL) (RES) --exec $MYSQL_DUMP --compact test t1 DROP TABLE t1; diff --git a/mysql-test/t/parser.test b/mysql-test/t/parser.test index e579e371184..e6c9c8b423f 100644 --- a/mysql-test/t/parser.test +++ b/mysql-test/t/parser.test @@ -646,6 +646,10 @@ select conv(255 AS p1, 10 AS p2, 16 AS p3); # Native function with a variable number of arguments +# Bug in libm.so on Solaris: +# atan(10) from 32-bit version returns 1.4711276743037347 +# atan(10) from 64-bit version returns 1.4711276743037345 +--replace_result 1.4711276743037345 1.4711276743037347 select atan(10); -- error ER_WRONG_PARAMETERS_TO_NATIVE_FCT select atan(10 AS p1); diff --git a/mysql-test/t/type_decimal.test b/mysql-test/t/type_decimal.test index dfe36ed0905..5d9a2aaa5f4 100644 --- a/mysql-test/t/type_decimal.test +++ b/mysql-test/t/type_decimal.test @@ -410,6 +410,18 @@ SELECT ROUND(qty,3), dps, ROUND(qty,dps) FROM t1; DROP TABLE t1; # +# Bug #24541: "Data truncated..." on decimal type columns without any good reason +# + +create table t1 (c1 decimal(10,6)); +insert into t1 (c1) values (9.99e-4); +insert into t1 (c1) values (9.98e-4); +insert into t1 (c1) values (0.000999); +insert into t1 (c1) values (cast(9.99e-4 as decimal(10,6))); +select * from t1; +drop table t1; + +# # Bug#31019: MOD() function and operator crashes MySQL when # divisor is very long and < 1 # diff --git a/mysql-test/t/type_float.test b/mysql-test/t/type_float.test index 3b7b30db6f8..45cf80aab5c 100644 --- a/mysql-test/t/type_float.test +++ b/mysql-test/t/type_float.test @@ -7,7 +7,7 @@ drop table if exists t1,t2; --enable_warnings SELECT 10,10.0,10.,.1e+2,100.0e-1; -SELECT 6e-05, -6e-05, --6e-05, -6e-05+1.000000; +SELECT 6e-16, -6e-16, --6e-16, -6e-16+1.000000; SELECT 1e1,1.e1,1.0e1,1e+1,1.e+1,1.0e+1,1e-1,1.e-1,1.0e-1; SELECT 0.001e+1,0.001e-1, -0.001e+01,-0.001e-01; SELECT 123.23E+02,-123.23E-02,"123.23E+02"+0.0,"-123.23E-02"+0.0; @@ -252,6 +252,37 @@ insert into t1 values (2e30), (-2e30); select f1 + 0e0 from t1; drop table t1; +# +# Bug #12860 "Difference in zero padding of exponent between Unix and Windows" +# + +create table t1 (c char(6)); +insert into t1 values (2e6),(2e-5); +select * from t1; +drop table t1; + +# +# Bug #21497 "DOUBLE truncated to unusable value" +# + +CREATE TABLE d1 (d DOUBLE); +INSERT INTO d1 VALUES (1.7976931348623157E+308); +SELECT * FROM d1; +--error ER_ILLEGAL_VALUE_FOR_TYPE +INSERT INTO d1 VALUES (1.79769313486232e+308); +SELECT * FROM d1; +DROP TABLE d1; + +# +# Bug #26788 "mysqld (debug) aborts when inserting specific numbers into char +# fields" +# + +create table t1 (a char(20)); +insert into t1 values (1.225e-05); +select a+0 from t1; +drop table t1; + # # Bug #27483: Casting 'scientific notation type' to 'unsigned bigint' fails on # windows. diff --git a/mysql-test/t/type_newdecimal.test b/mysql-test/t/type_newdecimal.test index 2cf7ab8fbdf..8af9d4c263e 100644 --- a/mysql-test/t/type_newdecimal.test +++ b/mysql-test/t/type_newdecimal.test @@ -1054,10 +1054,8 @@ while ($max_power) } SELECT my_float, my_double, my_varchar FROM t1; -# Expected result 0.000000000011754943372854760000 -# On windows we get 0.000000000011754943372854770000 -# use replace_result to correct it ---replace_result 0.000000000011754943372854770000 0.000000000011754943372854760000 +# The following statement produces results with garbage past +# the significant digits. Improving it is a part of the WL#3977. SELECT CAST(my_float AS DECIMAL(65,30)), my_float FROM t1; SELECT CAST(my_double AS DECIMAL(65,30)), my_double FROM t1; SELECT CAST(my_varchar AS DECIMAL(65,30)), my_varchar FROM t1; |