Fixed Bug#10716, Procedure Analyse results in wrong values for optimal field type
Added test case.
This commit is contained in:
parent
12ffe0da12
commit
ac95c9096b
@ -102,3 +102,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.v " \\ 1 19 0 0 3.7619 NULL ENUM('"','""','"c','\'\0\\"','\'','\'\'','\'b','a\0\0\0b','a\0','a""""b','a\'\'\'\'b','abc','abc\'def\\hij"klm\0opq','a\\\\\\\\b','b\'','c"','d\\','The\ZEnd','\\','\\d','\\\\') 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;
|
||||
|
@ -48,4 +48,13 @@ insert into t1 values ('abc'),('abc\'def\\hij\"klm\0opq'),('\''),('\"'),('\\'),(
|
||||
select * from t1 procedure analyse();
|
||||
drop table t1;
|
||||
|
||||
#
|
||||
# Bug#10716 - Procedure Analyse results in wrong values for optimal field type
|
||||
#
|
||||
|
||||
create table t1 (d double);
|
||||
insert into t1 values (100000);
|
||||
select * from t1 procedure analyse (1,1);
|
||||
drop table t1;
|
||||
|
||||
# End of 4.1 tests
|
||||
|
@ -789,18 +789,23 @@ void field_real::get_opt_type(String *answer,
|
||||
if (!max_notzero_dec_len)
|
||||
{
|
||||
if (min_arg >= -128 && max_arg <= (min_arg >= 0 ? 255 : 127))
|
||||
sprintf(buff, "TINYINT(%d)", (int) max_length - (item->decimals + 1));
|
||||
sprintf(buff, "TINYINT(%d)", (int) max_length -
|
||||
((item->decimals == NOT_FIXED_DEC) ? 0 : (item->decimals + 1)));
|
||||
else if (min_arg >= INT_MIN16 && max_arg <= (min_arg >= 0 ?
|
||||
UINT_MAX16 : INT_MAX16))
|
||||
sprintf(buff, "SMALLINT(%d)", (int) max_length - (item->decimals + 1));
|
||||
sprintf(buff, "SMALLINT(%d)", (int) max_length -
|
||||
((item->decimals == NOT_FIXED_DEC) ? 0 : (item->decimals + 1)));
|
||||
else if (min_arg >= INT_MIN24 && max_arg <= (min_arg >= 0 ?
|
||||
UINT_MAX24 : INT_MAX24))
|
||||
sprintf(buff, "MEDIUMINT(%d)", (int) max_length - (item->decimals + 1));
|
||||
sprintf(buff, "MEDIUMINT(%d)", (int) max_length -
|
||||
((item->decimals == NOT_FIXED_DEC) ? 0 : (item->decimals + 1)));
|
||||
else if (min_arg >= INT_MIN32 && max_arg <= (min_arg >= 0 ?
|
||||
UINT_MAX32 : INT_MAX32))
|
||||
sprintf(buff, "INT(%d)", (int) max_length - (item->decimals + 1));
|
||||
sprintf(buff, "INT(%d)", (int) max_length -
|
||||
((item->decimals == NOT_FIXED_DEC) ? 0 : (item->decimals + 1)));
|
||||
else
|
||||
sprintf(buff, "BIGINT(%d)", (int) max_length - (item->decimals + 1));
|
||||
sprintf(buff, "BIGINT(%d)", (int) max_length -
|
||||
((item->decimals == NOT_FIXED_DEC) ? 0 : (item->decimals + 1)));
|
||||
answer->append(buff, (uint) strlen(buff));
|
||||
if (min_arg >= 0)
|
||||
answer->append(" UNSIGNED");
|
||||
|
Loading…
x
Reference in New Issue
Block a user