bk commit into 4.1 tree (gluh:1.2124) BUG#8656

[gluh]

Below is the list of changes that have just been committed into a local
4.1 repository of gluh. When gluh 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
  1.2124 05/03/16 16:44:28 gluh@stripped +3 -0
  Fix for bug#8656: Crash with group_concat on alias in outer table
  fixed result_field support of Item_ref

  sql/item.h
    1.173 05/03/16 16:44:22 gluh@stripped +1 -0
    Fix for bug#8656: Crash with group_concat on alias in outer table
    fixed result_field support of Item_ref

  mysql-test/t/func_gconcat.test
    1.25 05/03/16 16:44:22 gluh@stripped +8 -0
    Fix for bug#8656: Crash with group_concat on alias in outer table
    fixed result_field support of Item_ref

  mysql-test/r/func_gconcat.result
    1.34 05/03/16 16:44:22 gluh@stripped +7 -0
    Fix for bug#8656: Crash with group_concat on alias in outer table
    fixed result_field support of Item_ref

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gluh
# Host:	gluh.mysql.r18.ru
# Root:	/home/gluh/MySQL-MERGE/mysql-4.1

--- 1.172/sql/item.h	Fri Mar  4 13:16:24 2005
+++ 1.173/sql/item.h	Wed Mar 16 16:44:22 2005
@@ -902,6 +902,7 @@
   void save_org_in_field(Field *field)	{ (*ref)->save_org_in_field(field); }
   enum Item_result result_type () const { return (*ref)->result_type(); }
   enum_field_types field_type() const   { return (*ref)->field_type(); }
+  Field *get_tmp_table_field() { return result_field; }
   table_map used_tables() const		
   { 
     return depended_from ? OUTER_REF_TABLE_BIT : (*ref)->used_tables(); 

--- 1.33/mysql-test/r/func_gconcat.result	Sat Jan 15 12:04:32 2005
+++ 1.34/mysql-test/r/func_gconcat.result	Wed Mar 16 16:44:22 2005
@@ -462,3 +462,10 @@
 gc
 NULL
 DROP TABLE t1;
+create table r2 (a int, b int);
+insert into r2 values (1,1), (2,2);
+select  b x, (select group_concat(x) from r2) from  r2;
+x	(select group_concat(x) from r2)
+1	1,1
+2	2,2
+drop table r2;

--- 1.24/mysql-test/t/func_gconcat.test	Sat Jan 15 12:04:11 2005
+++ 1.25/mysql-test/t/func_gconcat.test	Wed Mar 16 16:44:22 2005
@@ -284,3 +284,11 @@
 CREATE TABLE t1 (id int);
 SELECT GROUP_CONCAT(id) AS gc FROM t1 HAVING gc IS NULL;
 DROP TABLE t1;
+
+#
+# Bug #8656: Crash with group_concat on alias in outer table
+#
+create table r2 (a int, b int);
+insert into r2 values (1,1), (2,2);
+select  b x, (select group_concat(x) from r2) from  r2;
+drop table r2;