diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-04-21 18:34:06 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-04-21 18:34:06 +0200 |
| commit | 8d75a7533ee80efa5275a058dfadf8947e5857a6 (patch) | |
| tree | 463cddda9c516dc3cd7c3e94fb08910210473622 /sql/item_sum.cc | |
| parent | e056d1f1ca91ebe40467ed46be00be0add9cf247 (diff) | |
| parent | c6ee3fe9d4056dcd6ee9f9aabd3424c1b27fc506 (diff) | |
| download | mariadb-git-8d75a7533ee80efa5275a058dfadf8947e5857a6.tar.gz | |
Merge branch '5.5' into 10.0
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 d1ab102c709..0f10d832ba6 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -3442,7 +3442,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 */ |