Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint

into  mysql.com:/usr/home/ram/work/5.0.b10966

2 files changed, 1 insertions, 4 deletions

diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index 4d70debb966..898ea28985b 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -1256,9 +1256,6 @@ Field *Item_sum_variance::create_tmp_field(bool group, TABLE *table,
                              sizeof(double)*2) + sizeof(longlong),
                             0, name, table, &my_charset_bin);
   }
-  if (hybrid_type == DECIMAL_RESULT)
-    return new Field_new_decimal(max_length, maybe_null, name, table,
-                                 decimals, unsigned_flag);
   return new Field_double(max_length, maybe_null,name,table,decimals);
 }
 
diff --git a/sql/item_sum.h b/sql/item_sum.h
index f4ff257aa4e..f1ea95214de 100644
--- a/sql/item_sum.h
+++ b/sql/item_sum.h
@@ -688,7 +688,7 @@ public:
     { return sample ? "var_samp(" : "variance("; }
   Item *copy_or_same(THD* thd);
   Field *create_tmp_field(bool group, TABLE *table, uint convert_blob_length);
-  enum Item_result result_type () const { return hybrid_type; }
+  enum Item_result result_type () const { return REAL_RESULT; }
 };
 
 class Item_sum_std;