database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my41-bug20305

Browse Source 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my50-bug20305


mysql-test/r/analyse.result:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
mysql-test/t/analyse.test:
  manual merge
This commit is contained in:
unknown
2006-09-28 14:32:30 -04:00
parent 131d94f58c 314e10592c
commit e99cf7edb9
3 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_analyse.cc
View File

@@ -807,9 +807,9 @@ void field_str::get_opt_type(String *answer, ha_rows total_rows)
else if (num_info.decimals) // DOUBLE(%d,%d) sometime
{
if (num_info.dval > -FLT_MAX && num_info.dval < FLT_MAX)
sprintf(buff, "FLOAT(%d,%d)", num_info.integers, num_info.decimals);
sprintf(buff, "FLOAT(%d,%d)", (num_info.integers + num_info.decimals), num_info.decimals);
else
sprintf(buff, "DOUBLE(%d,%d)", num_info.integers, num_info.decimals);
sprintf(buff, "DOUBLE(%d,%d)", (num_info.integers + num_info.decimals), num_info.decimals);
}
else if (ev_num_info.llval >= -128 &&
ev_num_info.ullval <=
@@ -916,10 +916,10 @@ void field_real::get_opt_type(String *answer,
else
{
if (min_arg >= -FLT_MAX && max_arg <= FLT_MAX)
sprintf(buff, "FLOAT(%d,%d)", (int) max_length - (item->decimals + 1),
sprintf(buff, "FLOAT(%d,%d)", (int) max_length - (item->decimals + 1) + max_notzero_dec_len,
max_notzero_dec_len);
else
sprintf(buff, "DOUBLE(%d,%d)", (int) max_length - (item->decimals + 1),
sprintf(buff, "DOUBLE(%d,%d)", (int) max_length - (item->decimals + 1) + max_notzero_dec_len,
max_notzero_dec_len);
answer->append(buff, (uint) strlen(buff));
}