diff options
| author | Alexander Barkov <bar@mysql.com> | 2010-10-08 18:06:31 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mysql.com> | 2010-10-08 18:06:31 +0400 |
| commit | 3fdcf2060d85a14f39b59f9e59e3e2f842f2f8a5 (patch) | |
| tree | 0dadd7cb8f51ecef168832b07a508cbeec55ae7c /sql/item.cc | |
| parent | c192be206ae36398804b473f7b0e4ee4431b71da (diff) | |
| download | mariadb-git-3fdcf2060d85a14f39b59f9e59e3e2f842f2f8a5.tar.gz | |
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.
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item.cc b/sql/item.cc index fff7511015f..b166f3e645f 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -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 its memory: it will be reused on each execute. */ - arena= thd->is_stmt_prepare() ? thd->activate_stmt_arena_if_needed(&backup) - : NULL; + arena= thd->activate_stmt_arena_if_needed(&backup); for (i= 0, arg= args; i < nargs; i++, arg+= item_sep) { |