1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged code. Removed unneccessary repeating.

Browse Source
This commit is contained in:
unknown 2005-09-13 18:11:51 +03:00
parent b51879f169
commit 02fce1c316
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sql/sql_analyse.cc
View File

@ -788,24 +788,22 @@ void field_real::get_opt_type(String *answer,
if (!max_notzero_dec_len) if (!max_notzero_dec_len)
{ {
int len= (int) max_length - ((item->decimals == NOT_FIXED_DEC) ?
0 : (item->decimals + 1));
if (min_arg >= -128 && max_arg <= (min_arg >= 0 ? 255 : 127)) if (min_arg >= -128 && max_arg <= (min_arg >= 0 ? 255 : 127))
sprintf(buff, "TINYINT(%d)", (int) max_length - sprintf(buff, "TINYINT(%d)", len);
((item->decimals == NOT_FIXED_DEC) ? 0 : (item->decimals + 1)));
else if (min_arg >= INT_MIN16 && max_arg <= (min_arg >= 0 ? else if (min_arg >= INT_MIN16 && max_arg <= (min_arg >= 0 ?
UINT_MAX16 : INT_MAX16)) UINT_MAX16 : INT_MAX16))
sprintf(buff, "SMALLINT(%d)", (int) max_length - sprintf(buff, "SMALLINT(%d)", len);
((item->decimals == NOT_FIXED_DEC) ? 0 : (item->decimals + 1)));
else if (min_arg >= INT_MIN24 && max_arg <= (min_arg >= 0 ? else if (min_arg >= INT_MIN24 && max_arg <= (min_arg >= 0 ?
UINT_MAX24 : INT_MAX24)) UINT_MAX24 : INT_MAX24))
sprintf(buff, "MEDIUMINT(%d)", (int) max_length - sprintf(buff, "MEDIUMINT(%d)", len);
((item->decimals == NOT_FIXED_DEC) ? 0 : (item->decimals + 1)));
else if (min_arg >= INT_MIN32 && max_arg <= (min_arg >= 0 ? else if (min_arg >= INT_MIN32 && max_arg <= (min_arg >= 0 ?
UINT_MAX32 : INT_MAX32)) UINT_MAX32 : INT_MAX32))
sprintf(buff, "INT(%d)", (int) max_length - sprintf(buff, "INT(%d)", len);
((item->decimals == NOT_FIXED_DEC) ? 0 : (item->decimals + 1)));
else else
sprintf(buff, "BIGINT(%d)", (int) max_length - sprintf(buff, "BIGINT(%d)", len);
((item->decimals == NOT_FIXED_DEC) ? 0 : (item->decimals + 1)));
answer->append(buff, (uint) strlen(buff)); answer->append(buff, (uint) strlen(buff));
if (min_arg >= 0) if (min_arg >= 0)
answer->append(" UNSIGNED"); answer->append(" UNSIGNED");