Commit 49be919a authored by unknown's avatar unknown
Browse files

Merged from 4.1

parent 8de4865a

mysql-test/r/analyse.result

+6 −0
Original line number Diff line number Diff line
@@ -109,3 +109,9 @@ select * from t1 procedure analyse(); 
Field_name	Min_value	Max_value	Min_length	Max_length	Empties_or_zeros	Nulls	Avg_value_or_avg_length	Std	Optimal_fieldtype

test.t1.df	1.1	2.2	8	8	0	0	1.650000000	0.302500000	ENUM('1.1','2.2') NOT NULL

drop table t1;

create table t1 (d double);

insert into t1 values (100000);

select * from t1 procedure analyse (1,1);

Field_name	Min_value	Max_value	Min_length	Max_length	Empties_or_zeros	Nulls	Avg_value_or_avg_length	Std	Optimal_fieldtype

test.t1.d	100000	100000	6	6	0	0	100000	0	MEDIUMINT(6) UNSIGNED NOT NULL

drop table t1;

mysql-test/t/analyse.test

+8 −7
Original line number Diff line number Diff line
@@ -48,6 +48,14 @@ insert into t1 values ('abc'),('abc\'def\\hij\"klm\0opq'),('\''),('\"'),('\\'),( 
select * from t1 procedure analyse();

drop table t1;



#decimal-related test



create table t1 (df decimal(5,1));

insert into t1 values(1.1);

insert into t1 values(2.2);

select * from t1 procedure analyse();

drop table t1;



#

# Bug#10716 - Procedure Analyse results in wrong values for optimal field type

#
@@ -59,10 +67,3 @@ drop table t1; 


# End of 4.1 tests

#decimal-related test



create table t1 (df decimal(5,1));

insert into t1 values(1.1);

insert into t1 values(2.2);

select * from t1 procedure analyse();

drop table t1;