Commit 10ab9144 authored by mhansson@dl145s.mysql.com's avatar mhansson@dl145s.mysql.com
Browse files

Merge mhansson@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 

into  dl145s.mysql.com:/users/mhansson/mysql/autopush/5.0o-5.0o-bug28273
parents 7d006ee5 b1375104

mysql-test/r/func_gconcat.result

+26 −0
Original line number Diff line number Diff line
@@ -737,4 +737,30 @@ SELECT GROUP_CONCAT(DISTINCT UCASE(b)) FROM t1; 
GROUP_CONCAT(DISTINCT UCASE(b))

ONE.1,TWO.2,ONE.3

DROP TABLE t1;

CREATE TABLE t1( a VARCHAR( 10 ), b INT );

INSERT INTO t1 VALUES ( repeat( 'a', 10 ), 1), 

( repeat( 'b', 10 ), 2);

SET group_concat_max_len = 20;

SELECT GROUP_CONCAT( a ) FROM t1;

GROUP_CONCAT( a )

aaaaaaaaaa,bbbbbbbbb

Warnings:

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

SELECT GROUP_CONCAT( DISTINCT a ) FROM t1;

GROUP_CONCAT( DISTINCT a )

aaaaaaaaaa,bbbbbbbbb

Warnings:

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

SELECT GROUP_CONCAT( a ORDER BY b ) FROM t1;

GROUP_CONCAT( a ORDER BY b )

aaaaaaaaaa,bbbbbbbbb

Warnings:

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

SELECT GROUP_CONCAT( DISTINCT a ORDER BY b ) FROM t1;

GROUP_CONCAT( DISTINCT a ORDER BY b )

aaaaaaaaaa,bbbbbbbbb

Warnings:

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

SET group_concat_max_len = DEFAULT;

DROP TABLE t1;

End of 5.0 tests

mysql-test/t/func_gconcat.test

+14 −0
Original line number Diff line number Diff line
@@ -507,4 +507,18 @@ SELECT GROUP_CONCAT(DISTINCT UCASE(a)) FROM t1; 
SELECT GROUP_CONCAT(DISTINCT UCASE(b)) FROM t1;

DROP TABLE t1;



#

# Bug #28273: GROUP_CONCAT and ORDER BY: No warning when result gets truncated.

#

CREATE TABLE t1( a VARCHAR( 10 ), b INT );

INSERT INTO t1 VALUES ( repeat( 'a', 10 ), 1), 

                      ( repeat( 'b', 10 ), 2);

SET group_concat_max_len = 20;

SELECT GROUP_CONCAT( a ) FROM t1;

SELECT GROUP_CONCAT( DISTINCT a ) FROM t1;  

SELECT GROUP_CONCAT( a ORDER BY b ) FROM t1;          

SELECT GROUP_CONCAT( DISTINCT a ORDER BY b ) FROM t1; 

SET group_concat_max_len = DEFAULT;

DROP TABLE t1;



--echo End of 5.0 tests

sql/item_sum.cc

+4 −5
Original line number Diff line number Diff line
@@ -3339,6 +3339,10 @@ String* Item_func_group_concat::val_str(String* str) 
  DBUG_ASSERT(fixed == 1);

  if (null_value)

    return 0;

  if (!result.length() && tree)

    /* Tree is used for sorting as in ORDER BY */

    tree_walk(tree, (tree_walk_action)&dump_leaf_key, (void*)this,

              left_root_right);

  if (count_cut_values && !warning)

  {

    /*
@@ -3350,11 +3354,6 @@ String* Item_func_group_concat::val_str(String* str) 
                          ER_CUT_VALUE_GROUP_CONCAT,

                          ER(ER_CUT_VALUE_GROUP_CONCAT));

  }

  if (result.length())

    return &result;

  if (tree)

    tree_walk(tree, (tree_walk_action)&dump_leaf_key, (void*)this,

              left_root_right);

  return &result;

}