bzr push into mysql-5.5-bugteam branch (sergey.glukhov:3184 to 3185)

[Sergey Glukhov]

 3185 Sergey Glukhov	2010-12-13 [merge]
      5.1-bugteam->5.5-bugteam merge
     @ mysql-test/r/func_gconcat.result
        5.1-bugteam->5.5-bugteam merge
     @ mysql-test/t/func_gconcat.test
        5.1-bugteam->5.5-bugteam merge
     @ sql/item_sum.cc
        5.1-bugteam->5.5-bugteam merge

    modified:
      mysql-test/r/func_gconcat.result
      mysql-test/t/func_gconcat.test
      sql/item_sum.cc
 3184 Davi Arnaut	2010-12-10 [merge]
      Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.

=== modified file 'mysql-test/r/func_gconcat.result'
--- a/mysql-test/r/func_gconcat.result	2010-11-26 14:32:51 +0000
+++ b/mysql-test/r/func_gconcat.result	2010-12-13 10:48:16 +0000
@@ -1046,6 +1046,18 @@ INSERT INTO t1 values (0),(0);
 SELECT POLYGON((SELECT 1 FROM (SELECT 1 IN (GROUP_CONCAT(t1.f1)) FROM t1, t1 t GROUP BY t.f1 ) d));
 ERROR 22007: Illegal non geometric '(select 1 from (select (1 = group_concat(`test`.`t1`.`f1` separator ',')) AS `1 IN (GROUP_CONCAT(t1.f1))` from `test`.`t1` join `test`.`t1` `t` group by `t`.`f1`) `d`)' value found during parsing
 DROP TABLE t1;
+#
+# Bug#58396 group_concat and explain extended are still crashy
+#
+CREATE TABLE t1(a INT);
+EXPLAIN EXTENDED SELECT UPDATEXML('1', a, '1')
+FROM t1 ORDER BY (SELECT GROUP_CONCAT(1) FROM t1);
+ERROR HY000: Only constant XPATH queries are supported
+SHOW WARNINGS;
+Level	Code	Message
+Error	1105	Only constant XPATH queries are supported
+Note	1003	select updatexml('1',`test`.`t1`.`a`,'1') AS `UPDATEXML('1', a, '1')` from `test`.`t1` order by (select group_concat(1 separator ',') from `test`.`t1`)
+DROP TABLE t1;
 End of 5.1 tests
 DROP TABLE IF EXISTS t1, t2;
 CREATE TABLE t1 (a VARCHAR(6), b INT);

=== modified file 'mysql-test/t/func_gconcat.test'
--- a/mysql-test/t/func_gconcat.test	2010-11-26 14:32:51 +0000
+++ b/mysql-test/t/func_gconcat.test	2010-12-13 10:48:16 +0000
@@ -750,6 +750,17 @@ SELECT POLYGON((SELECT 1 FROM (SELECT 1 
 --enable_ps_protocol
 DROP TABLE t1;
 
+--echo #
+--echo # Bug#58396 group_concat and explain extended are still crashy
+--echo #
+
+CREATE TABLE t1(a INT);
+--error ER_UNKNOWN_ERROR
+EXPLAIN EXTENDED SELECT UPDATEXML('1', a, '1')
+FROM t1 ORDER BY (SELECT GROUP_CONCAT(1) FROM t1);
+SHOW WARNINGS;
+DROP TABLE t1;
+
 --echo End of 5.1 tests
 
 

=== modified file 'sql/item_sum.cc'
--- a/sql/item_sum.cc	2010-12-08 12:28:06 +0000
+++ b/sql/item_sum.cc	2010-12-13 10:48:16 +0000
@@ -3034,6 +3034,7 @@ Item_func_group_concat(Name_resolution_c
       order_item->item= arg_ptr++;
     }
   }
+  memcpy(orig_args, args, sizeof(Item*) * arg_count);
 }
 
 
@@ -3245,7 +3246,6 @@ Item_func_group_concat::fix_fields(THD *
   if (check_sum_func(thd, ref))
     return TRUE;
 
-  memcpy (orig_args, args, sizeof (Item *) * arg_count);
   fixed= 1;
   return FALSE;
 }

No bundle (reason: useless for push emails).