diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-08-05 00:02:46 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-08-05 00:02:46 +0200 |
| commit | 1610c4285aa2a3421cca9983360ff33e86936479 (patch) | |
| tree | 9b37ec3191f3c151bb3010cefb5c0104a6e3e16d /sql/item_sum.h | |
| parent | 0785b2d55d97207a00b2fb406f8da4aa4bfc9edf (diff) | |
| parent | 006ffca56e0638f14152f4ba97ecfc7bfe08d773 (diff) | |
| download | mariadb-git-1610c4285aa2a3421cca9983360ff33e86936479.tar.gz | |
Merge branch 'bb-10.0-jan' into 10.0
5.5 with our InnoDB changes
Diffstat (limited to 'sql/item_sum.h')
| -rw-r--r-- | sql/item_sum.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index d28c654c438..09a20487226 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -1394,6 +1394,7 @@ class Item_func_group_concat : public Item_sum String *separator; TREE tree_base; TREE *tree; + Item **ref_pointer_array; /** If DISTINCT is used with this GROUP_CONCAT, this member is used to filter |