diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-03-01 22:19:19 +0200 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-03-01 22:19:19 +0200 |
| commit | da3cf29b58731d97792bdd117c571df67510f41b (patch) | |
| tree | 701e55a57172693eb5cc80b3d8c70b8a5e5305f2 /sql/item_sum.h | |
| parent | 6b591f8f37e03012caf47a841321f2a4e12924b4 (diff) | |
| download | mariadb-git-da3cf29b58731d97792bdd117c571df67510f41b.tar.gz | |
Fix for Bug#5615 and merge from 4.1
mysql-test/r/func_group.result:
Added some tests and fix for Bug#5615.
mysql-test/r/show_check.result:
Fix for Bug#5615.
mysql-test/t/func_group.test:
Added some tests.
sql/item_sum.cc:
Fix for Bug#5615.
sql/item_sum.h:
Fix for Bug#5615.
sql/sql_select.cc:
Fix for Bug#5615.
sql/sql_select.h:
Fix for Bug#5615.
Diffstat (limited to 'sql/item_sum.h')
| -rw-r--r-- | sql/item_sum.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index 81f5d45e42e..fead45f1881 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -94,7 +94,6 @@ public: Item *get_tmp_table_item(THD *thd); virtual Field *create_tmp_field(bool group, TABLE *table, uint convert_blob_length); - bool walk (Item_processor processor, byte *argument); }; @@ -525,6 +524,8 @@ protected: void cleanup(); bool any_value() { return was_values; } void no_rows_in_result(); + Field *create_tmp_field(bool group, TABLE *table, + uint convert_blob_length); }; |