diff options
| author | unknown <serg@serg.mylan> | 2004-09-07 15:18:53 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-09-07 15:18:53 +0200 |
| commit | e7594c8102cc4ad30d87b57dd9f81302c4a59e39 (patch) | |
| tree | eb69e64fb069e7468a92e59eca620860f68aff61 /sql/sql_analyse.cc | |
| parent | 65d1cfc7040817f8da00b5f7c1d1d3ca096997be (diff) | |
| parent | 32a86d6b171d883e18a7896ef03ddefdf7070d49 (diff) | |
| download | mariadb-git-e7594c8102cc4ad30d87b57dd9f81302c4a59e39.tar.gz | |
merged
BitKeeper/etc/ignore:
auto-union
client/mysqlcheck.c:
Auto merged
myisammrg/myrg_open.c:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/sql_analyse.cc:
Auto merged
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 3f75dadb6f0..1e0aebbc1ec 100644 --- a/sql/sql_analyse.cc +++ b/sql/sql_analyse.cc @@ -799,6 +799,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) |