diff options
| author | kostja@bodhi.local <> | 2006-08-12 21:06:51 +0400 |
|---|---|---|
| committer | kostja@bodhi.local <> | 2006-08-12 21:06:51 +0400 |
| commit | 04c97488f91c3db48be384c2ed14082dc6d6616b (patch) | |
| tree | cccb1fdd583e353f4a229cbb0f9d585104db78f9 /sql/item_sum.h | |
| parent | b341356abdfa869c71d42709a13c2192603fab1c (diff) | |
| parent | 6691c623100134d666b142f5752fcc022bdd1ac9 (diff) | |
| download | mariadb-git-04c97488f91c3db48be384c2ed14082dc6d6616b.tar.gz | |
Merge bodhi.local:/opt/local/work/tmp_merge
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
Diffstat (limited to 'sql/item_sum.h')
| -rw-r--r-- | sql/item_sum.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index a0cd08dcb11..3679780db60 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; |