Commit 3fdcf206 authored by Alexander Barkov's avatar Alexander Barkov

The fix for

 Bug#55744 GROUP_CONCAT + CASE + ucs return garbage
revealed problems in how character set aggregation
code works with prepared statements.

This patch fixes (hopefully) the problems.
parent c192be20
...@@ -1783,8 +1783,7 @@ bool agg_item_set_converter(DTCollation &coll, const char *fname, ...@@ -1783,8 +1783,7 @@ bool agg_item_set_converter(DTCollation &coll, const char *fname,
In case we're in statement prepare, create conversion item In case we're in statement prepare, create conversion item
in its memory: it will be reused on each execute. in its memory: it will be reused on each execute.
*/ */
arena= thd->is_stmt_prepare() ? thd->activate_stmt_arena_if_needed(&backup) arena= thd->activate_stmt_arena_if_needed(&backup);
: NULL;
for (i= 0, arg= args; i < nargs; i++, arg+= item_sep) for (i= 0, arg= args; i < nargs; i++, arg+= item_sep)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment