diff options
| author | Sergey Glukhov <sergey.glukhov@oracle.com> | 2010-12-13 13:48:16 +0300 |
|---|---|---|
| committer | Sergey Glukhov <sergey.glukhov@oracle.com> | 2010-12-13 13:48:16 +0300 |
| commit | 8394b6a2713ff0823448aa62eea1251bfb2f9e03 (patch) | |
| tree | 1e3e429b1cc491af54dbaece6d64832e04fcddf1 /sql | |
| parent | 63cf028a047b17b6e2d23a4b0cb600094a41a9ae (diff) | |
| parent | 6330815a0ce15311cb90781d633b4c8cdfd34834 (diff) | |
| download | mariadb-git-8394b6a2713ff0823448aa62eea1251bfb2f9e03.tar.gz | |
5.1-bugteam->5.5-bugteam merge
Diffstat (limited to 'sql')
| -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 7aff7940c4d..107634e196d 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -3034,6 +3034,7 @@ Item_func_group_concat(Name_resolution_context *context_arg, order_item->item= arg_ptr++; } } + memcpy(orig_args, args, sizeof(Item*) * arg_count); } @@ -3245,7 +3246,6 @@ Item_func_group_concat::fix_fields(THD *thd, Item **ref) if (check_sum_func(thd, ref)) return TRUE; - memcpy (orig_args, args, sizeof (Item *) * arg_count); fixed= 1; return FALSE; } |