diff options
| author | unknown <ram@gw.mysql.r18.ru> | 2004-06-15 16:03:16 +0500 |
|---|---|---|
| committer | unknown <ram@gw.mysql.r18.ru> | 2004-06-15 16:03:16 +0500 |
| commit | 0f83847940dfa10ba641230607e52321f27df3a8 (patch) | |
| tree | 28411be61405a826e3a2858d4e85950cfdd255f8 /sql/item_sum.h | |
| parent | 125f840133735bc1031d06612aa04f07800066b2 (diff) | |
| parent | 2ef5b0ed4e87c38ad031b3005cdbd05a09fef69b (diff) | |
| download | mariadb-git-0f83847940dfa10ba641230607e52321f27df3a8.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4035
sql/item_strfunc.cc:
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 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index be8bb28e16b..507a36194de 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -696,7 +696,6 @@ class Item_func_group_concat : public Item_sum ORDER **order; TABLE_LIST *tables_list; ulong group_concat_max_len; - uint show_elements; uint arg_count_order; uint arg_count_field; uint field_list_offset; |