summaryrefslogtreecommitdiff
path: root/sql/item_sum.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-06-13 19:01:28 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-06-13 19:01:28 +0300
commit805340936aa47493886bafd119863d83c475f45c (patch)
tree46e5a4bd2e8311ef2880caa0526ce705a40c925e /sql/item_sum.h
parentf9e53a659c87f1147d4f6d004702077d4d0ce5d7 (diff)
parentd83a4432503d199f6aed8e378563b08471d090dc (diff)
downloadmariadb-git-805340936aa47493886bafd119863d83c475f45c.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'sql/item_sum.h')
-rw-r--r--sql/item_sum.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h
index 7bf8a41f405..7a6fda708a4 100644
--- a/sql/item_sum.h
+++ b/sql/item_sum.h
@@ -1871,7 +1871,8 @@ class Item_func_group_concat : public Item_sum
bool warning_for_row;
bool always_null;
bool force_copy_fields;
- bool no_appended;
+ /** True if entire result of GROUP_CONCAT has been written to output buffer. */
+ bool result_finalized;
/** Limits the rows in the result */
Item *row_limit;
/** Skips a particular number of rows in from the result*/