diff options
| author | unknown <iggy@rolltop.ignatz42.dyndns.org> | 2006-09-28 14:33:39 -0400 |
|---|---|---|
| committer | unknown <iggy@rolltop.ignatz42.dyndns.org> | 2006-09-28 14:33:39 -0400 |
| commit | d8387be448ede8ef76dc0af34968369a0a7c4aee (patch) | |
| tree | eb96c809028922c68d0d34e27db725b6f4f60d29 /sql/sql_analyse.cc | |
| parent | e1f08634ce6c1b0f8a7fed304d172eabc89c1f6a (diff) | |
| parent | e99cf7edb9649fe847e8f1b7ac694febda844968 (diff) | |
| download | mariadb-git-d8387be448ede8ef76dc0af34968369a0a7c4aee.tar.gz | |
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my50-bug20305
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20305/my51-bug20305
mysql-test/r/analyse.result:
Auto merged
sql/sql_analyse.cc:
Auto merged
Diffstat (limited to 'sql/sql_analyse.cc')
| -rw-r--r-- | sql/sql_analyse.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_analyse.cc b/sql/sql_analyse.cc index 9f1a0561138..264e3e2b988 100644 --- a/sql/sql_analyse.cc +++ b/sql/sql_analyse.cc @@ -806,9 +806,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 <= @@ -915,10 +915,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)); } |