diff options
| author | timour@mysql.com <> | 2004-11-25 11:37:28 +0200 |
|---|---|---|
| committer | timour@mysql.com <> | 2004-11-25 11:37:28 +0200 |
| commit | 38ab93c6befaca29e2fc36f0f24ce2d1e464550b (patch) | |
| tree | 29ad0385fdb639f58ab052e5bb498f9429a374d9 /sql/sql_analyse.cc | |
| parent | 5eae363c329978a8d87cadc76a1a4967f38a7d70 (diff) | |
| parent | cf722bc3f5040d447f657477485e362b967d1f3e (diff) | |
| download | mariadb-git-38ab93c6befaca29e2fc36f0f24ce2d1e464550b.tar.gz | |
Merge for BUG#3759 which was missing from the main tree for some reason.
Diffstat (limited to 'sql/sql_analyse.cc')
| -rw-r--r-- | sql/sql_analyse.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/sql_analyse.cc b/sql/sql_analyse.cc index 3847849d6a7..0723c274a17 100644 --- a/sql/sql_analyse.cc +++ b/sql/sql_analyse.cc @@ -810,6 +810,13 @@ void field_real::get_opt_type(String *answer, if (min_arg >= 0) answer->append(" UNSIGNED"); } + else if (item->decimals == NOT_FIXED_DEC) + { + if (min_arg >= -FLT_MAX && max_arg <= FLT_MAX) + answer->append("FLOAT", 5); + else + answer->append("DOUBLE", 6); + } else { if (min_arg >= -FLT_MAX && max_arg <= FLT_MAX) |