Commit 4d7aaed1 authored by unknown's avatar unknown
Browse files

Bug#10201 group_concat returns string with binary collation 

item.cc:
  After merge fixes.
func_gconcat.result:
  After merge fixes


mysql-test/r/func_gconcat.result:
  After merge fixes
sql/item.cc:
  After merge fixes.
parent 5fa6e3c5

mysql-test/r/func_gconcat.result

+1 −1
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ create table t2 select group_concat(a) as a from t1; 
show create table t2;

Table	Create Table

t2	CREATE TABLE `t2` (

  `a` longtext character set cp1250

  `a` varchar(400) character set cp1250 default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

select collation(group_concat(a,_koi8r'test')) from t1;

collation(group_concat(a,_koi8r'test'))

sql/item.cc

+8 −2
Original line number Diff line number Diff line
@@ -1191,7 +1191,7 @@ bool agg_item_charsets(DTCollation &coll, const char *fname, 
  }



  THD *thd= current_thd;

  Item_arena *arena, backup;

  Query_arena *arena, backup;

  bool res= FALSE;

  /*

    In case we're in statement prepare, create conversion item
@@ -1220,7 +1220,8 @@ bool agg_item_charsets(DTCollation &coll, const char *fname, 
      res= TRUE;

      break; // we cannot return here, we need to restore "arena".

    }

    conv->fix_fields(thd, 0, &conv);

    if ((*arg)->type() == Item::FIELD_ITEM)

      ((Item_field *)(*arg))->no_const_subst= 1;

    /*

      If in statement prepare, then we create a converter for two

      constant items, do it once and then reuse it.
@@ -1235,6 +1236,11 @@ bool agg_item_charsets(DTCollation &coll, const char *fname, 
      *arg= conv;

    else

      thd->change_item_tree(arg, conv);

    /*

      We do not check conv->fixed, because Item_func_conv_charset which can

      be return by safe_charset_converter can't be fixed at creation

    */

    conv->fix_fields(thd, arg);

  }

  if (arena)

    thd->restore_backup_item_arena(arena, &backup);