summaryrefslogtreecommitdiff
path: root/sql/sql_analyse.cc
diff options
context:
space:
mode:
authorserg@serg.mylan <>2004-09-07 15:18:53 +0200
committerserg@serg.mylan <>2004-09-07 15:18:53 +0200
commit413a8753e2f7582b0a4a0716014a9e260b20b9c8 (patch)
treeeb69e64fb069e7468a92e59eca620860f68aff61 /sql/sql_analyse.cc
parent30b7504330171890858d40e875b38d0a44c6cd9f (diff)
parent707def6fd0914e673cd9bde1271a59de2af5ef2c (diff)
downloadmariadb-git-413a8753e2f7582b0a4a0716014a9e260b20b9c8.tar.gz
merged
Diffstat (limited to 'sql/sql_analyse.cc')
-rw-r--r--sql/sql_analyse.cc7
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)