diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-04-28 20:19:32 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-04-28 20:19:32 +0200 |
| commit | e74f2e2b8629ab79a6c2f93acff6e17a7ddee7ff (patch) | |
| tree | c6f2f7343bf9ad5dfd40ec83d5485ec3e05d26d2 /sql/item_sum.cc | |
| parent | b82c602db588cfa688278ef772050c004590c124 (diff) | |
| parent | 49552cf1f7adb3f3b7bb53696cc178363e4d9cb2 (diff) | |
| download | mariadb-git-e74f2e2b8629ab79a6c2f93acff6e17a7ddee7ff.tar.gz | |
Merge branch '10.0' 10.1
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 540eefcc79a..1a4fe3b0ccc 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -3360,7 +3360,7 @@ Item_func_group_concat::fix_fields(THD *thd, Item **ref) args[i]->fix_fields(thd, args + i)) || args[i]->check_cols(1)) return TRUE; - with_subselect|= args[i]->with_subselect; + with_subselect|= args[i]->with_subselect; } /* skip charset aggregation for order columns */ |