diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-03-18 10:35:03 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-03-18 10:35:03 +0100 |
| commit | a4a18e0cbbaf2a43507b3c2232fed700403ad04d (patch) | |
| tree | 9062f9793518f2f88b617e39f718a18d007298a5 /sql/item_create.cc | |
| parent | 511b9432637510617b04bde92c51a184c1e3aea8 (diff) | |
| download | mariadb-git-a4a18e0cbbaf2a43507b3c2232fed700403ad04d.tar.gz | |
MDEV-4289 Assertion `0' fails in make_sortkey with GROUP_CONCAT, MAKE_SET, GROUP BY
Item_func_make_set wasn't taking into account the first argument when
calculating maybe_null.
sql/item_strfunc.cc:
rewrite Item_func_make_set, removing separate storage of the first argument
sql/item_strfunc.h:
rewrite Item_func_make_set, removing separate storage of the first argument
Diffstat (limited to 'sql/item_create.cc')
| -rw-r--r-- | sql/item_create.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item_create.cc b/sql/item_create.cc index a5dc3eeb5ad..78b50ff01fc 100644 --- a/sql/item_create.cc +++ b/sql/item_create.cc @@ -3952,8 +3952,7 @@ Create_func_make_set::create_native(THD *thd, LEX_STRING name, return NULL; } - Item *param_1= item_list->pop(); - return new (thd->mem_root) Item_func_make_set(param_1, *item_list); + return new (thd->mem_root) Item_func_make_set(*item_list); } |