Commit 7fd9135b authored by kaa@polly.(none)'s avatar kaa@polly.(none)
Browse files

Fix for bug #26788 "mysqld (debug) aborts when inserting specific 

numbers into char fields" and bug #12860 "Difference in zero padding of
exponent between Unix and Windows"

Rewrote the code that determines what 'precision' argument should be
passed to sprintf() to fit the string representation of the input number
into the field.
We get finer control over conversion by pre-calculating the exponent, so
we are able to determine which conversion format, 'e' or 'f', will be
used by sprintf().
We also remove the leading zero from the exponent on Windows to make it
compatible with the sprintf() output on other platforms.
parent 80a2d47b

mysql-test/r/insert.result

+120 −0
Original line number Diff line number Diff line
@@ -461,4 +461,124 @@ i 
2

2

DROP TABLE t1, t2;

CREATE TABLE t1 (

a char(20) NOT NULL,

b char(7) DEFAULT NULL,

c char(4) DEFAULT NULL

);

INSERT INTO t1(a,b,c) VALUES (9.999999e+0, 9.999999e+0, 9.999e+0);

INSERT INTO t1(a,b,c) VALUES (1.225e-05, 1.225e-05, 1.225e-05);

Warnings:

Warning	1265	Data truncated for column 'c' at row 1

INSERT INTO t1(a,b) VALUES (1.225e-04, 1.225e-04);

INSERT INTO t1(a,b) VALUES (1.225e-01, 1.225e-01);

INSERT INTO t1(a,b) VALUES (1.225877e-01, 1.225877e-01);

INSERT INTO t1(a,b) VALUES (1.225e+01, 1.225e+01);

INSERT INTO t1(a,b,c) VALUES (1.225e+01, 1.225e+01, 1.225e+01);

INSERT INTO t1(a,b) VALUES (1.225e+05, 1.225e+05);

INSERT INTO t1(a,b) VALUES (1.225e+10, 1.225e+10);

INSERT INTO t1(a,b) VALUES (1.225e+15, 1.225e+15);

INSERT INTO t1(a,b) VALUES (5000000e+0, 5000000e+0);

INSERT INTO t1(a,b) VALUES (1.25e+78, 1.25e+78);

INSERT INTO t1(a,b) VALUES (1.25e-94, 1.25e-94);

INSERT INTO t1(a,b) VALUES (1.25e+203, 1.25e+203);

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.999999000000000748	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

12.25	12.25	NULL

12.25	12.25	12.2

122500	122500	NULL

12250000000	1.2e+10	NULL

1225000000000000	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.37	NULL	-1.3

0.00187	NULL	0.00

-0.0187	NULL	-0.0

5000	NULL	5000

-5000	NULL	-500

DROP TABLE t1;

CREATE TABLE t1 (

a char(20) NOT NULL,

b char(7) DEFAULT NULL,

c char(5)

);

INSERT INTO t1(a,b,c) VALUES (9.999999e+0, 9.999999e+0, 9.999e+0);

INSERT INTO t1(a,b,c) VALUES (1.225e-05, 1.225e-05, 1.225e-05);

INSERT INTO t1(a,b) VALUES (1.225e-04, 1.225e-04);

INSERT INTO t1(a,b) VALUES (1.225e-01, 1.225e-01);

INSERT INTO t1(a,b) VALUES (1.225877e-01, 1.225877e-01);

INSERT INTO t1(a,b) VALUES (1.225e+01, 1.225e+01);

INSERT INTO t1(a,b,c) VALUES (1.225e+01, 1.225e+01, 1.225e+01);

INSERT INTO t1(a,b) VALUES (1.225e+05, 1.225e+05);

INSERT INTO t1(a,b) VALUES (1.225e+10, 1.225e+10);

INSERT INTO t1(a,b) VALUES (1.225e+15, 1.225e+15);

INSERT INTO t1(a,b) VALUES (5000000e+0, 5000000e+0);

INSERT INTO t1(a,b) VALUES (1.25e+78, 1.25e+78);

INSERT INTO t1(a,b) VALUES (1.25e-94, 1.25e-94);

INSERT INTO t1(a,b) VALUES (1.25e+203, 1.25e+203);

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);

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.999999000000000748	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

12.25	12.25	NULL

12.25	12.25	12.25

122500	122500	NULL

12250000000	1.2e+10	NULL

1225000000000000	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.37	NULL	-1.37

0.00187	NULL	0.002

-0.0187	NULL	-0.01

5000	NULL	5000

-5000	NULL	-5000

DROP TABLE t1;

CREATE TABLE t (a CHAR(10),b INT);

INSERT INTO t VALUES (),(),();

INSERT INTO t(a) SELECT rand() FROM t;

DROP TABLE t;

End of 5.0 tests.

mysql-test/t/cast.test

+0 −2
Original line number Diff line number Diff line
@@ -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;

mysql-test/t/insert.test

+81 −0
Original line number Diff line number Diff line
@@ -353,5 +353,86 @@ SELECT * FROM t2; 


DROP TABLE t1, t2;



#

# Bug #26788: mysqld (debug) aborts when inserting specific numbers into char

#             fields

#



CREATE TABLE t1 (

  a char(20) NOT NULL,

  b char(7) DEFAULT NULL,

  c char(4) DEFAULT NULL

);



INSERT INTO t1(a,b,c) VALUES (9.999999e+0, 9.999999e+0, 9.999e+0);

INSERT INTO t1(a,b,c) VALUES (1.225e-05, 1.225e-05, 1.225e-05);

INSERT INTO t1(a,b) VALUES (1.225e-04, 1.225e-04);

INSERT INTO t1(a,b) VALUES (1.225e-01, 1.225e-01);

INSERT INTO t1(a,b) VALUES (1.225877e-01, 1.225877e-01);

INSERT INTO t1(a,b) VALUES (1.225e+01, 1.225e+01);

INSERT INTO t1(a,b,c) VALUES (1.225e+01, 1.225e+01, 1.225e+01);

INSERT INTO t1(a,b) VALUES (1.225e+05, 1.225e+05);

INSERT INTO t1(a,b) VALUES (1.225e+10, 1.225e+10);

INSERT INTO t1(a,b) VALUES (1.225e+15, 1.225e+15);

INSERT INTO t1(a,b) VALUES (5000000e+0, 5000000e+0);

INSERT INTO t1(a,b) VALUES (1.25e+78, 1.25e+78);

INSERT INTO t1(a,b) VALUES (1.25e-94, 1.25e-94);

INSERT INTO t1(a,b) VALUES (1.25e+203, 1.25e+203);

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);

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);



SELECT * FROM t1;



DROP TABLE t1;



CREATE TABLE t1 (

  a char(20) NOT NULL,

  b char(7) DEFAULT NULL,

  c char(5)

);





INSERT INTO t1(a,b,c) VALUES (9.999999e+0, 9.999999e+0, 9.999e+0);

INSERT INTO t1(a,b,c) VALUES (1.225e-05, 1.225e-05, 1.225e-05);

INSERT INTO t1(a,b) VALUES (1.225e-04, 1.225e-04);

INSERT INTO t1(a,b) VALUES (1.225e-01, 1.225e-01);

INSERT INTO t1(a,b) VALUES (1.225877e-01, 1.225877e-01);

INSERT INTO t1(a,b) VALUES (1.225e+01, 1.225e+01);

INSERT INTO t1(a,b,c) VALUES (1.225e+01, 1.225e+01, 1.225e+01);

INSERT INTO t1(a,b) VALUES (1.225e+05, 1.225e+05);

INSERT INTO t1(a,b) VALUES (1.225e+10, 1.225e+10);

INSERT INTO t1(a,b) VALUES (1.225e+15, 1.225e+15);

INSERT INTO t1(a,b) VALUES (5000000e+0, 5000000e+0);

INSERT INTO t1(a,b) VALUES (1.25e+78, 1.25e+78);

INSERT INTO t1(a,b) VALUES (1.25e-94, 1.25e-94);

INSERT INTO t1(a,b) VALUES (1.25e+203, 1.25e+203);

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);

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);



SELECT * FROM t1;



DROP TABLE t1;



#

# Bug #31152: assertion in Field_str::store(double)

#



CREATE TABLE t (a CHAR(10),b INT);

INSERT INTO t VALUES (),(),();

INSERT INTO t(a) SELECT rand() FROM t;

DROP TABLE t;



--echo End of 5.0 tests.

mysql-test/t/type_float.test

+0 −5
Original line number Diff line number Diff line
@@ -116,15 +116,10 @@ drop table if exists t1; 
# Check conversion of floats to character field (Bug #7774)

create table t1 (c char(20));

insert into t1 values (5e-28);

# Expected result is "5e-28", but windows returns "5e-028"

--replace_result 5e-028 5e-28

select * from t1;

drop table t1;

create table t1 (c char(6));

insert into t1 values (2e5),(2e6),(2e-4),(2e-5);

# Expected result is "2e+06", but windows returns "2e+006"

# Expected result is "2e-05", but windows returns "2e-005"

--replace_result 2e+006 2e+06 2e-005 2e-05

select * from t1;

drop table t1;

mysql-test/t/variables.test

+0 −2
Original line number Diff line number Diff line
@@ -51,8 +51,6 @@ select @test, @`test`, @TEST, @`TEST`, @"teSt"; 
set @select=2,@t5=1.23456;

select @`select`,@not_used;

set @test_int=10,@test_double=1e-10,@test_string="abcdeghi",@test_string2="abcdefghij",@select=NULL;

# Expected result "1e-10", windows returns "1e-010"

--replace_result 1e-010 1e-10

select @test_int,@test_double,@test_string,@test_string2,@select;

set @test_int="hello",@test_double="hello",@test_string="hello",@test_string2="hello";

select @test_int,@test_double,@test_string,@test_string2;