bk commit into 5.1 tree (gkodinov:1.2576)

[kgeorge]

Below is the list of changes that have just been committed into a local
5.1 repository of kgeorge. When kgeorge 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, 2007-04-24 16:03:06+03:00, gkodinov@stripped +9 -0
  Merge gkodinov@stripped:/home/bk/mysql-5.1-opt
  into  magare.gmz:/home/kgeorge/mysql/autopush/B27786-addon-5.1-opt
  MERGE: 1.2542.18.2

  mysql-test/r/subselect3.result@stripped, 2007-04-24 16:03:02+03:00, gkodinov@stripped +0
-4
    Auto merged
    MERGE: 1.9.1.2

  mysql-test/r/view.result@stripped, 2007-04-24 16:03:02+03:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.219.1.1

  mysql-test/t/view.test@stripped, 2007-04-24 16:03:02+03:00, gkodinov@stripped +0 -16
    Auto merged
    MERGE: 1.194.1.1

  sql/item_subselect.cc@stripped, 2007-04-24 16:03:02+03:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.151.1.1

  sql/item_subselect.h@stripped, 2007-04-24 16:03:02+03:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.92.1.1

  sql/sql_lex.h@stripped, 2007-04-24 16:03:02+03:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.271.1.1

  sql/sql_parse.cc@stripped, 2007-04-24 16:03:03+03:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.648.1.5

  sql/sql_select.cc@stripped, 2007-04-24 16:03:03+03:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.508.2.1

  sql/sql_view.cc@stripped, 2007-04-24 16:03:03+03:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.126.1.3

# 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:	gkodinov
# Host:	magare.gmz
# Root:	/home/kgeorge/mysql/autopush/B27786-addon-5.1-opt/RESYNC

--- 1.659/sql/sql_parse.cc	2007-04-13 12:47:39 +03:00
+++ 1.660/sql/sql_parse.cc	2007-04-24 16:03:03 +03:00
@@ -5961,7 +5961,7 @@ bool st_select_lex_unit::add_fake_select
   fake_select_lex->context.resolve_in_select_list= TRUE;
   fake_select_lex->context.select_lex= fake_select_lex;
 
-  if (!first_sl->next_select())
+  if (!is_union())
   {
     /* 
       This works only for 

--- 1.515/sql/sql_select.cc	2007-04-21 11:20:10 +03:00
+++ 1.516/sql/sql_select.cc	2007-04-24 16:03:03 +03:00
@@ -231,7 +231,8 @@ bool handle_select(THD *thd, LEX *lex, s
   register SELECT_LEX *select_lex = &lex->select_lex;
   DBUG_ENTER("handle_select");
 
-  if (select_lex->next_select() || select_lex->master_unit()->fake_select_lex)
+  if (select_lex->master_unit()->is_union() || 
+      select_lex->master_unit()->fake_select_lex)
     res= mysql_union(thd, lex, result, &lex->unit, setup_tables_done_option);
   else
   {
@@ -442,7 +443,7 @@ JOIN::prepare(Item ***rref_pointer_array
   select_lex= select_lex_arg;
   select_lex->join= this;
   join_list= &select_lex->top_join_list;
-  union_part= (unit_arg->first_select()->next_select() != 0);
+  union_part= unit_arg->is_union();
 
   thd->lex->current_select->is_item_list_lookup= 1;
   /*
@@ -1191,7 +1192,7 @@ JOIN::optimize()
   if (!group_list && !order &&
       unit->item && unit->item->substype() == Item_subselect::IN_SUBS
&&
       tables == 1 && conds &&
-      !unit->first_select()->next_select())
+      !unit->is_union())
   {
     if (!having)
     {
@@ -3165,7 +3166,7 @@ add_key_fields(JOIN *join, KEY_FIELD **k
       if (!join->group_list && !join->order &&
           join->unit->item && 
           join->unit->item->substype() == Item_subselect::IN_SUBS &&
-          !join->unit->first_select()->next_select())
+          !join->unit->is_union())
       {
         KEY_FIELD *save= *key_fields;
         add_key_fields(join, key_fields, and_level, cond_arg, usable_tables,
@@ -15523,7 +15524,7 @@ bool mysql_explain_union(THD *thd, SELEC
 		 "UNION")));
     sl->options|= SELECT_DESCRIBE;
   }
-  if (first->next_select())
+  if (unit->is_union())
   {
     unit->fake_select_lex->select_number= UINT_MAX; // jost for initialization
     unit->fake_select_lex->type= "UNION RESULT";

--- 1.152/sql/item_subselect.cc	2007-03-28 21:05:03 +03:00
+++ 1.153/sql/item_subselect.cc	2007-04-24 16:03:02 +03:00
@@ -82,7 +82,7 @@ void Item_subselect::init(st_select_lex 
     parsing_place= (outer_select->in_sum_expr ?
                     NO_MATTER :
                     outer_select->parsing_place);
-    if (select_lex->next_select())
+    if (unit->is_union())
       engine= new subselect_union_engine(unit, result, this);
     else
       engine= new subselect_single_select_engine(select_lex, result, this);
@@ -412,7 +412,7 @@ Item_singlerow_subselect::select_transfo
   SELECT_LEX *select_lex= join->select_lex;
   Query_arena *arena= thd->stmt_arena;
  
-  if (!select_lex->master_unit()->first_select()->next_select() &&
+  if (!select_lex->master_unit()->is_union() &&
       !select_lex->table_list.elements &&
       select_lex->item_list.elements == 1 &&
       !select_lex->item_list.head()->with_sum_func &&
@@ -1147,7 +1147,7 @@ Item_in_subselect::single_value_transfor
     else
     {
       bool tmp;
-      if (select_lex->master_unit()->first_select()->next_select())
+      if (select_lex->master_unit()->is_union())
       {
 	/*
 	  comparison functions can't be changed during fix_fields()

--- 1.131/sql/sql_view.cc	2007-04-21 11:20:10 +03:00
+++ 1.132/sql/sql_view.cc	2007-04-24 16:03:03 +03:00
@@ -829,7 +829,7 @@ loop_out:
     UNION
   */
   if (view->updatable_view &&
-      !lex->select_lex.next_select() &&
+      !lex->select_lex.master_unit()->is_union() &&
       !((TABLE_LIST*)lex->select_lex.table_list.first)->next_local &&
       find_table_in_global_list(lex->query_tables->next_global,
 				lex->query_tables->db,