Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.0

into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.0

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.0
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.0
e04e50b6 · jani@rhols221.adsl.netsonic.fi · 04fd9031 · 56b4c316 · e04e50b6
Commit e04e50b6 authored Sep 07, 2004 by jani@rhols221.adsl.netsonic.fi
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

sql/sql_analyse.cc sql/sql_analyse.cc +7 -0

No files found.
--- 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)