mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-04 06:05:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.0' 10.1

Browse source
This commit is contained in:
Sergei Golubchik 2017-04-28 20:19:32 +02:00
commit e74f2e2b86
71 changed files with 1114 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql/item_sum.cc
View file

@ -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 */