diff options
| author | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-07-23 12:58:26 +0500 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-07-23 12:58:26 +0500 |
| commit | 774300afe4d8a9f2f39f9a9a75e5f03cd9366262 (patch) | |
| tree | 08fa09f5252fbbbbd7c9f4cc92b6b37c3ecbceca /sql/item_sum.h | |
| parent | 7c7949b05b8e5482bae6967f5bf2de78934dbbef (diff) | |
| parent | 4e846a3d274357de741aa8c53f6eeba04aa00fc9 (diff) | |
| download | mariadb-git-774300afe4d8a9f2f39f9a9a75e5f03cd9366262.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into mysql.com:/usr/home/ram/work/5.0.b10966
mysql-test/r/func_group.result:
Auto merged
mysql-test/t/func_group.test:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
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 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; |