bk commit into 6.0 tree (davi:1.2645) BUG#36785

[Davi Arnaut]

Below is the list of changes that have just been committed into a local
6.0 repository of davi.  When davi does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-05-19 19:39:24-03:00, davi@stripped +8 -0
  Bug#36785: Wrong error message when group_concat() exceeds max length
  
  The problem is that when ER_CUT_VALUE_GROUP_CONCAT is elevated
  to a error, message does not get updated with the number of cut
  lines when group_concat() exceeds max length.
  
  The solution is to modify the warning message to be more meaningful
  by giving the number of the line that was cut and to issue the warning
  for each line that is cut. This approach is inline with how other
  per-row truncated data warnings are issued avoids violating the warning
  internal interface.

  mysql-test/r/func_gconcat.result@stripped, 2008-05-19 19:39:15-03:00, davi@stripped +50 -14
    Update result to reflect the new warning message
    and add test case result for Bug#36785

  mysql-test/r/join_outer.result@stripped, 2008-05-19 19:39:15-03:00, davi@stripped +8 -4
    Update result to reflect the new warning message

  mysql-test/r/query_cache.result@stripped, 2008-05-19 19:39:16-03:00, davi@stripped +1 -1
    Update result to reflect the new warning message

  mysql-test/t/func_gconcat.test@stripped, 2008-05-19 19:39:16-03:00, davi@stripped +32 -0
    Add test case for Bug#36785

  sql/item_sum.cc@stripped, 2008-05-19 19:39:16-03:00, davi@stripped +10 -34
    Set warning whenever a line is cut.

  sql/item_sum.h@stripped, 2008-05-19 19:39:16-03:00, davi@stripped +1 -4
    Remove pointer to warning and count of cut values and
    add parameter to count number of rows.

  sql/share/errmsg.txt@stripped, 2008-05-19 19:39:16-03:00, davi@stripped +2 -7
    Update warning message ER_CUT_VALUE_GROUP_CONCAT.

  sql/sql_error.h@stripped, 2008-05-19 19:39:16-03:00, davi@stripped +2 -0
    Hide set_msg parameter, warning message may not be
    modified after it's set.

diff -Nrup a/mysql-test/r/func_gconcat.result b/mysql-test/r/func_gconcat.result
--- a/mysql-test/r/func_gconcat.result	2008-05-01 10:22:16 -03:00
+++ b/mysql-test/r/func_gconcat.result	2008-05-19 19:39:15 -03:00
@@ -153,10 +153,10 @@ grp	group_concat(c)
 4	
 5	NULL
 Warnings:
-Warning	1260	1 line(s) were cut by GROUP_CONCAT()
+Warning	1260	Row 4 was cut by GROUP_CONCAT()
 show warnings;
 Level	Code	Message
-Warning	1260	1 line(s) were cut by GROUP_CONCAT()
+Warning	1260	Row 4 was cut by GROUP_CONCAT()
 set group_concat_max_len = 1024;
 select group_concat(sum(c)) from t1 group by grp;
 ERROR HY000: Invalid use of group function
@@ -380,25 +380,29 @@ group_concat(b)
 bb,c
 BB,C
 Warnings:
-Warning	1260	2 line(s) were cut by GROUP_CONCAT()
+Warning	1260	Row 2 was cut by GROUP_CONCAT()
+Warning	1260	Row 4 was 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()
+Warning	1260	Row 2 was cut by GROUP_CONCAT()
+Warning	1260	Row 4 was 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()
+Warning	1260	Row 3 was cut by GROUP_CONCAT()
+Warning	1260	Row 6 was 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()
+Warning	1260	Row 3 was cut by GROUP_CONCAT()
+Warning	1260	Row 6 was 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')), 
@@ -426,25 +430,29 @@ 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()
+Warning	1260	Row 7 was cut by GROUP_CONCAT()
+Warning	1260	Row 14 was 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()
+Warning	1260	Row 5 was cut by GROUP_CONCAT()
+Warning	1260	Row 10 was 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()
+Warning	1260	Row 2 was cut by GROUP_CONCAT()
+Warning	1260	Row 4 was 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()
+Warning	1260	Row 2 was cut by GROUP_CONCAT()
+Warning	1260	Row 4 was cut by GROUP_CONCAT()
 drop table t1;
 create table t1 (a varchar(255) character set cp1250 collate cp1250_general_ci,
 b varchar(255) character set koi8r);
@@ -751,22 +759,22 @@ SELECT GROUP_CONCAT( a ) FROM t1;
 GROUP_CONCAT( a )
 aaaaaaaaaa,bbbbbbbbb
 Warnings:
-Warning	1260	1 line(s) were cut by GROUP_CONCAT()
+Warning	1260	Row 2 was 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()
+Warning	1260	Row 2 was 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()
+Warning	1260	Row 2 was 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()
+Warning	1260	Row 2 was cut by GROUP_CONCAT()
 SET group_concat_max_len = DEFAULT;
 DROP TABLE t1;
 SET group_concat_max_len= 65535;
@@ -979,3 +987,31 @@ GROUP BY t1.a
 1
 DROP TABLE t1, t2;
 End of 5.0 tests
+DROP TABLE IF EXISTS t1, t2;
+CREATE TABLE t1 (a VARCHAR(6), b INT);
+CREATE TABLE t2 (a VARCHAR(6), b INT);
+INSERT INTO t1 VALUES ('111111', 1);
+INSERT INTO t1 VALUES ('222222', 2);
+INSERT INTO t1 VALUES ('333333', 3);
+INSERT INTO t1 VALUES ('444444', 4);
+INSERT INTO t1 VALUES ('555555', 5);
+SET group_concat_max_len = 5;
+SET @old_sql_mode = @@sql_mode, @@sql_mode = 'traditional';
+SELECT GROUP_CONCAT(a), b FROM t1 GROUP BY b LIMIT 3;
+GROUP_CONCAT(a)	b
+11111	1
+22222	2
+33333	3
+Warnings:
+Warning	1260	Row 1 was cut by GROUP_CONCAT()
+Warning	1260	Row 2 was cut by GROUP_CONCAT()
+Warning	1260	Row 3 was cut by GROUP_CONCAT()
+INSERT INTO t2 SELECT GROUP_CONCAT(a), b FROM t1 GROUP BY b;
+ERROR HY000: Row 1 was cut by GROUP_CONCAT()
+UPDATE t1 SET a = '11111' WHERE b = 1;
+UPDATE t1 SET a = '22222' WHERE b = 2;
+INSERT INTO t2 SELECT GROUP_CONCAT(a), b FROM t1 GROUP BY b;
+ERROR HY000: Row 3 was cut by GROUP_CONCAT()
+SET group_concat_max_len = DEFAULT;
+SET @@sql_mode = @old_sql_mode;
+DROP TABLE t1, t2;
diff -Nrup a/mysql-test/r/join_outer.result b/mysql-test/r/join_outer.result
--- a/mysql-test/r/join_outer.result	2007-05-27 16:19:31 -03:00
+++ b/mysql-test/r/join_outer.result	2008-05-19 19:39:15 -03:00
@@ -942,25 +942,29 @@ group_concat(t1.b,t2.c)
 aaaaa
 bbbbb
 Warnings:
-Warning	1260	2 line(s) were cut by GROUP_CONCAT()
+Warning	1260	Row 1 was cut by GROUP_CONCAT()
+Warning	1260	Row 2 was cut by GROUP_CONCAT()
 select group_concat(t1.b,t2.c) from t1 inner join t2 using(a) group by t1.a;
 group_concat(t1.b,t2.c)
 aaaaa
 bbbbb
 Warnings:
-Warning	1260	2 line(s) were cut by GROUP_CONCAT()
+Warning	1260	Row 1 was cut by GROUP_CONCAT()
+Warning	1260	Row 2 was cut by GROUP_CONCAT()
 select group_concat(t1.b,t2.c) from t1 left join t2 using(a) group by a;
 group_concat(t1.b,t2.c)
 aaaaa
 bbbbb
 Warnings:
-Warning	1260	2 line(s) were cut by GROUP_CONCAT()
+Warning	1260	Row 1 was cut by GROUP_CONCAT()
+Warning	1260	Row 2 was cut by GROUP_CONCAT()
 select group_concat(t1.b,t2.c) from t1 inner join t2 using(a) group by a;
 group_concat(t1.b,t2.c)
 aaaaa
 bbbbb
 Warnings:
-Warning	1260	2 line(s) were cut by GROUP_CONCAT()
+Warning	1260	Row 1 was cut by GROUP_CONCAT()
+Warning	1260	Row 2 was cut by GROUP_CONCAT()
 drop table t1, t2;
 set group_concat_max_len=default;
 create table t1 (gid smallint(5) unsigned not null, x int(11) not null, y int(11) not
null, art int(11) not null, primary key  (gid,x,y));
diff -Nrup a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result
--- a/mysql-test/r/query_cache.result	2008-03-27 15:58:36 -03:00
+++ b/mysql-test/r/query_cache.result	2008-05-19 19:39:16 -03:00
@@ -889,7 +889,7 @@ select group_concat(a) FROM t1 group by 
 group_concat(a)
 1234567890
 Warnings:
-Warning	1260	1 line(s) were cut by GROUP_CONCAT()
+Warning	1260	Row 1 was cut by GROUP_CONCAT()
 set group_concat_max_len=1024;
 select group_concat(a) FROM t1 group by b;
 group_concat(a)
diff -Nrup a/mysql-test/t/func_gconcat.test b/mysql-test/t/func_gconcat.test
--- a/mysql-test/t/func_gconcat.test	2008-05-01 10:22:18 -03:00
+++ b/mysql-test/t/func_gconcat.test	2008-05-19 19:39:16 -03:00
@@ -694,3 +694,35 @@ SELECT 1 FROM t1 WHERE t1.a NOT IN
 DROP TABLE t1, t2;
 
 --echo End of 5.0 tests
+
+#
+# Bug#36785: Wrong error message when group_concat() exceeds max length
+#
+
+--disable_warnings
+DROP TABLE IF EXISTS t1, t2;
+--enable_warnings
+
+CREATE TABLE t1 (a VARCHAR(6), b INT);
+CREATE TABLE t2 (a VARCHAR(6), b INT);
+
+INSERT INTO t1 VALUES ('111111', 1);
+INSERT INTO t1 VALUES ('222222', 2);
+INSERT INTO t1 VALUES ('333333', 3);
+INSERT INTO t1 VALUES ('444444', 4);
+INSERT INTO t1 VALUES ('555555', 5);
+
+SET group_concat_max_len = 5;
+SET @old_sql_mode = @@sql_mode, @@sql_mode = 'traditional';
+
+SELECT GROUP_CONCAT(a), b FROM t1 GROUP BY b LIMIT 3;
+--error ER_CUT_VALUE_GROUP_CONCAT
+INSERT INTO t2 SELECT GROUP_CONCAT(a), b FROM t1 GROUP BY b;
+UPDATE t1 SET a = '11111' WHERE b = 1;
+UPDATE t1 SET a = '22222' WHERE b = 2;
+--error ER_CUT_VALUE_GROUP_CONCAT
+INSERT INTO t2 SELECT GROUP_CONCAT(a), b FROM t1 GROUP BY b;
+
+SET group_concat_max_len = DEFAULT;
+SET @@sql_mode = @old_sql_mode;
+DROP TABLE t1, t2;
diff -Nrup a/sql/item_sum.cc b/sql/item_sum.cc
--- a/sql/item_sum.cc	2008-05-01 10:22:19 -03:00
+++ b/sql/item_sum.cc	2008-05-19 19:39:16 -03:00
@@ -3075,6 +3075,8 @@ int dump_leaf_key(uchar* key, element_co
       result->append(*res);
   }
 
+  item->row_count++;
+
   /* stop if length of result more than max_length */
   if (result->length() > item->max_length)
   {
@@ -3093,8 +3095,10 @@ int dump_leaf_key(uchar* key, element_co
                                           result->length(),
                                           &well_formed_error);
     result->length(old_length + add_length);
-    item->count_cut_values++;
     item->warning_for_row= TRUE;
+    push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_WARN,
+                        ER_CUT_VALUE_GROUP_CONCAT, ER(ER_CUT_VALUE_GROUP_CONCAT),
+                        item->row_count);
     return 1;
   }
   return 0;
@@ -3114,12 +3118,12 @@ Item_func_group_concat::
 Item_func_group_concat(Name_resolution_context *context_arg,
                        bool distinct_arg, List<Item> *select_list,
                        SQL_LIST *order_list, String *separator_arg)
-  :tmp_table_param(0), warning(0),
-   separator(separator_arg), tree(0), unique_filter(NULL), table(0),
+  :tmp_table_param(0), separator(separator_arg), tree(0),
+   unique_filter(NULL), table(0),
    order(0), context(context_arg),
    arg_count_order(order_list ? order_list->elements : 0),
    arg_count_field(select_list->elements),
-   count_cut_values(0),
+   row_count(0),
    distinct(distinct_arg),
    warning_for_row(FALSE),
    force_copy_fields(0), original(0)
@@ -3167,7 +3171,6 @@ Item_func_group_concat::Item_func_group_
                                                Item_func_group_concat *item)
   :Item_sum(thd, item),
   tmp_table_param(item->tmp_table_param),
-  warning(item->warning),
   separator(item->separator),
   tree(item->tree),
   unique_filter(item->unique_filter),
@@ -3176,7 +3179,7 @@ Item_func_group_concat::Item_func_group_
   context(item->context),
   arg_count_order(item->arg_count_order),
   arg_count_field(item->arg_count_field),
-  count_cut_values(item->count_cut_values),
+  row_count(item->row_count),
   distinct(item->distinct),
   warning_for_row(item->warning_for_row),
   always_null(item->always_null),
@@ -3194,15 +3197,6 @@ void Item_func_group_concat::cleanup()
   DBUG_ENTER("Item_func_group_concat::cleanup");
   Item_sum::cleanup();
 
-  /* Adjust warning message to include total number of cut values */
-  if (warning)
-  {
-    char warn_buff[MYSQL_ERRMSG_SIZE];
-    sprintf(warn_buff, ER(ER_CUT_VALUE_GROUP_CONCAT), count_cut_values);
-    warning->set_msg(current_thd, warn_buff);
-    warning= 0;
-  }
-
   /*
     Free table and tree if they belong to this item (if item have not pointer
     to original item from which was made copy => it own its objects )
@@ -3226,15 +3220,8 @@ void Item_func_group_concat::cleanup()
         delete unique_filter;
         unique_filter= NULL;
       }
-      if (warning)
-      {
-        char warn_buff[MYSQL_ERRMSG_SIZE];
-        sprintf(warn_buff, ER(ER_CUT_VALUE_GROUP_CONCAT), count_cut_values);
-        warning->set_msg(thd, warn_buff);
-        warning= 0;
-      }
     }
-    DBUG_ASSERT(tree == 0 && warning == 0);
+    DBUG_ASSERT(tree == 0);
   }
   DBUG_VOID_RETURN;
 }
@@ -3517,17 +3504,6 @@ String* Item_func_group_concat::val_str(
     /* 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)
-  {
-    /*
-      ER_CUT_VALUE_GROUP_CONCAT needs an argument, but this gets set in
-      Item_func_group_concat::cleanup().
-    */
-    DBUG_ASSERT(table);
-    warning= push_warning(table->in_use, MYSQL_ERROR::WARN_LEVEL_WARN,
-                          ER_CUT_VALUE_GROUP_CONCAT,
-                          ER(ER_CUT_VALUE_GROUP_CONCAT));
-  }
   return &result;
 }
 
diff -Nrup a/sql/item_sum.h b/sql/item_sum.h
--- a/sql/item_sum.h	2008-03-28 12:01:46 -03:00
+++ b/sql/item_sum.h	2008-05-19 19:39:16 -03:00
@@ -1170,12 +1170,9 @@ public:
 
 #endif /* HAVE_DLOPEN */
 
-class MYSQL_ERROR;
-
 class Item_func_group_concat : public Item_sum
 {
   TMP_TABLE_PARAM *tmp_table_param;
-  MYSQL_ERROR *warning;
   String result;
   String *separator;
   TREE tree_base;
@@ -1196,7 +1193,7 @@ class Item_func_group_concat : public It
   uint arg_count_order;
   /** The number of selected items, aka the expr list. */
   uint arg_count_field;
-  uint count_cut_values;
+  uint row_count;
   bool distinct;
   bool warning_for_row;
   bool always_null;
diff -Nrup a/sql/share/errmsg.txt b/sql/share/errmsg.txt
--- a/sql/share/errmsg.txt	2008-04-30 20:32:08 -03:00
+++ b/sql/share/errmsg.txt	2008-05-19 19:39:16 -03:00
@@ -4879,13 +4879,8 @@ ER_ZLIB_Z_DATA_ERROR  
         por "ZLIB: Dados de entrada está corrupto"
         spa "ZLIB: Dato de entrada fué corrompido para zlib"
 ER_CUT_VALUE_GROUP_CONCAT  
-        eng "%d line(s) were cut by GROUP_CONCAT()"
-        ger "%d Zeile(n) durch GROUP_CONCAT() abgeschnitten"
-        nla "%d regel(s) door GROUP_CONCAT() ingekort"
-        por "%d linha(s) foram cortada(s) por GROUP_CONCAT()"
-        spa "%d línea(s) fue(fueron) cortadas por group_concat()"
-        swe "%d rad(er) kapades av group_concat()"
-        ukr "%d line(s) was(were) cut by group_concat()"
+        eng "Row %u was cut by GROUP_CONCAT()"
+        por "Linha %u foi cortada por GROUP_CONCAT()"
 ER_WARN_TOO_FEW_RECORDS 01000 
         eng "Row %ld doesn't contain data for all columns"
         ger "Zeile %ld enthält nicht für alle Felder Daten"
diff -Nrup a/sql/sql_error.h b/sql/sql_error.h
--- a/sql/sql_error.h	2007-06-07 05:39:32 -03:00
+++ b/sql/sql_error.h	2008-05-19 19:39:16 -03:00
@@ -30,6 +30,8 @@ public:
     if (msg_arg)
       set_msg(thd, msg_arg);
   }
+
+private:
   void set_msg(THD *thd, const char *msg_arg);
 };