diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-10-22 20:52:47 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-10-22 20:52:47 +0300 |
| commit | 31e2ac35149e9a4bf532da76ce1ffc925a9dce5a (patch) | |
| tree | 094f3d63a932eeaa346520cc5605255beab9debe /sql/item_sum.h | |
| parent | 2698d9a7283e7f0a1ee5f65e72ca8003af890664 (diff) | |
| parent | ec052b43a942cbf781727bbf78c8448230262424 (diff) | |
| download | mariadb-git-31e2ac35149e9a4bf532da76ce1ffc925a9dce5a.tar.gz | |
Merge
mysql-test/t/subselect.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_derived.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/subselect.result:
SCCS merged
Diffstat (limited to 'sql/item_sum.h')
| -rw-r--r-- | sql/item_sum.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index e5061e1e05a..d454f06ccde 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -238,6 +238,7 @@ class Item_sum_count_distinct :public Item_sum_int void make_unique(); Item *copy_or_same(THD* thd); void no_rows_in_result() {} + void print(String *str); }; @@ -748,4 +749,5 @@ class Item_func_group_concat : public Item_sum String* val_str(String* str); Item *copy_or_same(THD* thd); void no_rows_in_result() {} + void print(String *str); }; |