bk commit into 5.0 tree (igor:1.2094)

[igor]

Below is the list of changes that have just been committed into a local
5.0 repository of igor. When igor 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.2094 06/04/21 08:19:38 igor@stripped +4 -0
  Post merge fixes

  sql/sql_yacc.yy
    1.466 06/04/21 08:19:31 igor@stripped +1 -1
    Post merge fixes

  sql/sql_union.cc
    1.132 06/04/21 08:19:31 igor@stripped +1 -1
    Post merge fixes

  sql/sql_parse.cc
    1.540 06/04/21 08:19:31 igor@stripped +3 -2
    Post merge fixes

  mysql-test/r/func_gconcat.result
    1.58 06/04/21 08:19:31 igor@stripped +10 -0
    Post merge fixes

# 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:	igor
# Host:	rurik.mysql.com
# Root:	/home/igor/dev/mysql-5.0-0

--- 1.539/sql/sql_parse.cc	2006-04-21 00:36:14 -07:00
+++ 1.540/sql/sql_parse.cc	2006-04-21 08:19:31 -07:00
@@ -6355,17 +6355,18 @@
   SELECT_LEX *first_sl= first_select();
   DBUG_ENTER("add_fake_select_lex");
   DBUG_ASSERT(!fake_select_lex);
-  
+
   if (!(fake_select_lex= new (thd->mem_root) SELECT_LEX()))
       DBUG_RETURN(1);
   fake_select_lex->include_standalone(this, 
                                       (SELECT_LEX_NODE**)&fake_select_lex);
   fake_select_lex->select_number= INT_MAX;
+  fake_select_lex->parent_lex= thd->lex; /* Used in init_query. */
   fake_select_lex->make_empty_select();
   fake_select_lex->linkage= GLOBAL_OPTIONS_TYPE;
   fake_select_lex->select_limit= 0;
 
-  fake_select_lex->context.outer_context= first_sl->context.outer_context;
+  fake_select_lex->context.outer_context=first_sl->context.outer_context;
   /* allow item list resolving in fake select for ORDER BY */
   fake_select_lex->context.resolve_in_select_list= TRUE;
   fake_select_lex->context.select_lex= fake_select_lex;

--- 1.465/sql/sql_yacc.yy	2006-04-20 23:28:57 -07:00
+++ 1.466/sql/sql_yacc.yy	2006-04-21 08:19:31 -07:00
@@ -5719,7 +5719,7 @@
             SELECT_LEX *first_sl= unit->first_select();
             if (!first_sl->next_select() &&
                 (first_sl->order_list.elements || 
-                 first_sl->select_limit != HA_POS_ERROR) &&            
+                 first_sl->select_limit) &&            
                 unit->add_fake_select_lex(lex->thd))
               YYABORT;
           }

--- 1.131/sql/sql_union.cc	2006-04-21 00:36:14 -07:00
+++ 1.132/sql/sql_union.cc	2006-04-21 08:19:31 -07:00
@@ -202,7 +202,7 @@
   
   thd_arg->lex->current_select= sl= first_sl;
   found_rows_for_union= first_sl->options & OPTION_FOUND_ROWS;
-  is_union= test(first_select->next_select() || fake_select_lex);
+  is_union= first_sl->next_select() || fake_select_lex;
 
   /* Global option */
 

--- 1.57/mysql-test/r/func_gconcat.result	2006-04-20 02:33:34 -07:00
+++ 1.58/mysql-test/r/func_gconcat.result	2006-04-21 08:19:31 -07:00
@@ -611,6 +611,16 @@
 1
 3
 drop table t1;
+create table t1 (f1 int unsigned, f2 varchar(255));
+insert into t1 values (1,repeat('a',255)),(2,repeat('b',255));
+select f2,group_concat(f1) from t1 group by f2;
+Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
+def	test	t1	t1	f2	f2	253	255	255	Y	0	0	8
+def					group_concat(f1)	253	400	1	Y	128	0	63
+f2	group_concat(f1)
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa	1
+bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb	2
+drop table t1;
 set names latin1;
 create table t1 (a char, b char);
 insert into t1 values ('a', 'a'), ('a', 'b'), ('b', 'a'), ('b', 'b');