Commit b123f514 authored by unknown's avatar unknown
Browse files

Blob support for the group_concat() function. 

(Bug #4315: GROUP_CONCAT with ORDER BY returns strange results for TEXT fields
 Bug #5564: Strange behaviour with group_concat and distinct
 Bug #5970: group_concat doesn't print warnings)
parent 57fedc40

mysql-test/r/func_gconcat.result

+91 −0
Original line number Diff line number Diff line
@@ -366,3 +366,94 @@ A_ID B_DESC 
3	F

DROP TABLE t1;

DROP TABLE t2;

create table t1 (a int, b text);

insert into t1 values (1, 'bb'), (1, 'ccc'), (1, 'a'), (1, 'bb'), (1, 'ccc');

insert into t1 values (2, 'BB'), (2, 'CCC'), (2, 'A'), (2, 'BB'), (2, 'CCC');

select group_concat(b) from t1 group by a;

group_concat(b)

bb,ccc,a,bb,ccc

BB,CCC,A,BB,CCC

select group_concat(distinct b) from t1 group by a;

group_concat(distinct b)

bb,ccc,a

BB,CCC,A

select group_concat(b order by b) from t1 group by a;

group_concat(b order by b)

a,bb,bb,ccc,ccc

A,BB,BB,CCC,CCC

select group_concat(distinct b order by b) from t1 group by a;

group_concat(distinct b order by b)

a,bb,ccc

A,BB,CCC

set local group_concat_max_len=4;

select group_concat(b) from t1 group by a;

group_concat(b)

bb,c

BB,C

Warnings:

Warning	1260	2 line(s) were cut by GROUP_CONCAT()

select group_concat(distinct b) from t1 group by a;

group_concat(distinct b)

bb,c

BB,C

Warnings:

Warning	1260	2 line(s) were cut by GROUP_CONCAT()

select group_concat(b order by b) from t1 group by a;

group_concat(b order by b)

a,bb

A,BB

Warnings:

Warning	1260	2 line(s) were cut by GROUP_CONCAT()

select group_concat(distinct b order by b) from t1 group by a;

group_concat(distinct b order by b)

a,bb

A,BB

Warnings:

Warning	1260	2 line(s) were cut by GROUP_CONCAT()

insert into t1 values (1, concat(repeat('1', 300), '2')), 

(1, concat(repeat('1', 300), '2')), (1, concat(repeat('0', 300), '1')), 

(2, concat(repeat('1', 300), '2')), (2, concat(repeat('1', 300), '2')), 

(2, concat(repeat('0', 300), '1'));

set local group_concat_max_len=1024;

select group_concat(b) from t1 group by a;

group_concat(b)

bb,ccc,a,bb,ccc,1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112,1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112,0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001

BB,CCC,A,BB,CCC,1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112,1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112,0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001

select group_concat(distinct b) from t1 group by a;

group_concat(distinct b)

bb,ccc,a,1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112,0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001

BB,CCC,A,1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112,0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001

select group_concat(b order by b) from t1 group by a;

group_concat(b order by b)

0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001,1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112,1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112,a,bb,bb,ccc,ccc

0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001,1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112,1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112,A,BB,BB,CCC,CCC

select group_concat(distinct b order by b) from t1 group by a;

group_concat(distinct b order by b)

0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001,1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112,a,bb,ccc

0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001,1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112,A,BB,CCC

set local group_concat_max_len=400;

select group_concat(b) from t1 group by a;

group_concat(b)

bb,ccc,a,bb,ccc,1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112,1111111111111111111111111111111111111111111111111111111111111111111111111111111111

BB,CCC,A,BB,CCC,1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112,1111111111111111111111111111111111111111111111111111111111111111111111111111111111

Warnings:

Warning	1260	2 line(s) were cut by GROUP_CONCAT()

select group_concat(distinct b) from t1 group by a;

group_concat(distinct b)

bb,ccc,a,1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112,00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000

BB,CCC,A,1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111112,00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000

Warnings:

Warning	1260	2 line(s) were cut by GROUP_CONCAT()

select group_concat(b order by b) from t1 group by a;

group_concat(b order by b)

0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001,11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111

0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001,11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111

Warnings:

Warning	1260	2 line(s) were cut by GROUP_CONCAT()

select group_concat(distinct b order by b) from t1 group by a;

group_concat(distinct b order by b)

0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001,11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111

0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001,11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111

Warnings:

Warning	1260	2 line(s) were cut by GROUP_CONCAT()

drop table t1;

mysql-test/r/query_cache.result

+2 −0
Original line number Diff line number Diff line
@@ -901,6 +901,8 @@ set group_concat_max_len=10; 
select group_concat(a) FROM t1 group by b;

group_concat(a)

1234567890

Warnings:

Warning	1260	1 line(s) were cut by GROUP_CONCAT()

set group_concat_max_len=1024;

select group_concat(a) FROM t1 group by b;

group_concat(a)

mysql-test/t/func_gconcat.test

+37 −0
Original line number Diff line number Diff line
@@ -240,3 +240,40 @@ SELECT t1.A_ID, GROUP_CONCAT(t2.B_DESC) AS B_DESC FROM t1 LEFT JOIN t2 ON t1.A_I 
DROP TABLE t1;

DROP TABLE t2;



#

# blobs

#



create table t1 (a int, b text);

insert into t1 values (1, 'bb'), (1, 'ccc'), (1, 'a'), (1, 'bb'), (1, 'ccc');

insert into t1 values (2, 'BB'), (2, 'CCC'), (2, 'A'), (2, 'BB'), (2, 'CCC');

select group_concat(b) from t1 group by a;

select group_concat(distinct b) from t1 group by a;

select group_concat(b order by b) from t1 group by a;

select group_concat(distinct b order by b) from t1 group by a;

set local group_concat_max_len=4;

select group_concat(b) from t1 group by a;

select group_concat(distinct b) from t1 group by a;

select group_concat(b order by b) from t1 group by a;

select group_concat(distinct b order by b) from t1 group by a;



#

# long blobs

#



insert into t1 values (1, concat(repeat('1', 300), '2')), 

(1, concat(repeat('1', 300), '2')), (1, concat(repeat('0', 300), '1')), 

(2, concat(repeat('1', 300), '2')), (2, concat(repeat('1', 300), '2')), 

(2, concat(repeat('0', 300), '1'));

set local group_concat_max_len=1024;

select group_concat(b) from t1 group by a;

select group_concat(distinct b) from t1 group by a;

select group_concat(b order by b) from t1 group by a;

select group_concat(distinct b order by b) from t1 group by a;

set local group_concat_max_len=400;

select group_concat(b) from t1 group by a;

select group_concat(distinct b) from t1 group by a;

select group_concat(b order by b) from t1 group by a;

select group_concat(distinct b order by b) from t1 group by a;



drop table t1;

sql/item_sum.cc

+22 −18
Original line number Diff line number Diff line
@@ -1921,16 +1921,20 @@ bool Item_func_group_concat::add() 
  }



  null_value= FALSE;



  TREE_ELEMENT *el= 0;                          // Only for safety

  if (tree_mode)

  {

    if (!tree_insert(tree, table->record[0], 0, tree->custom_arg))

      return 1;

  }

  else

  {

    if (result.length() <= group_concat_max_len && !warning_for_row)

    el= tree_insert(tree, table->record[0], 0, tree->custom_arg);

  /*

    If the row is not a duplicate (el->count == 1)

    we can dump the row here in case of GROUP_CONCAT(DISTINCT...)

    instead of doing tree traverse later.

  */

  if (result.length() <= group_concat_max_len && 

      !warning_for_row &&

      (!tree_mode || (el->count == 1 && distinct && !arg_count_order)))

    dump_leaf_key(table->record[0], 1, this);

  }



  return 0;

}
@@ -1979,6 +1983,8 @@ Item_func_group_concat::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) 
  thd->allow_sum_func= 1;			

  if (!(tmp_table_param= new TMP_TABLE_PARAM))

    return 1;

  /* We'll convert all blobs to varchar fields in the temporary table */

  tmp_table_param->convert_blob_length= group_concat_max_len;

  tables_list= tables;

  fixed= 1;

  return 0;
@@ -2076,8 +2082,6 @@ bool Item_func_group_concat::setup(THD *thd) 
    }

    else

    {

       compare_key= NULL;

      if (distinct)

      compare_key= (qsort_cmp2) group_concat_key_cmp_with_distinct;

    }

    /*
@@ -2121,6 +2125,12 @@ String* Item_func_group_concat::val_str(String* str) 
  DBUG_ASSERT(fixed == 1);

  if (null_value)

    return 0;

  if (count_cut_values && !warning_available)

  {

    warning_available= TRUE;

    warning= push_warning(item_thd, MYSQL_ERROR::WARN_LEVEL_WARN,

                          ER_CUT_VALUE_GROUP_CONCAT, NULL);

  }

  if (result.length())

    return &result;

  if (tree_mode)
@@ -2128,12 +2138,6 @@ String* Item_func_group_concat::val_str(String* str) 
    tree_walk(tree, (tree_walk_action)&dump_leaf_key, (void*)this,

              left_root_right);

  }

  if (count_cut_values && !warning_available)

  {

    warning_available= TRUE;

    warning= push_warning(item_thd, MYSQL_ERROR::WARN_LEVEL_WARN,

                           ER_CUT_VALUE_GROUP_CONCAT, NULL);

  }

  return &result;

}

sql/mysql_priv.h

+1 −1
Original line number Diff line number Diff line
@@ -521,7 +521,7 @@ int mysql_union(THD *thd, LEX *lex, select_result *result, 
int mysql_handle_derived(LEX *lex);

Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,

			Item ***copy_func, Field **from_field,

			bool group,bool modify_item);

			bool group, bool modify_item, uint convert_blob_length);

int mysql_prepare_table(THD *thd, HA_CREATE_INFO *create_info,

		       List<create_field> &fields,

		       List<Key> &keys, uint &db_options,