bk commit into 4.1 tree

[sanja]

Below is the list of changes that have just been committed into a
4.1 repository of bell. When bell does a push, they will be propogated 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1259 02/06/05 22:05:08 bell@stripped +2 -0
  post-merged fixing

  sql/sql_select.cc
    1.167 02/06/05 22:05:07 bell@stripped +2 -2
    post-merged fixing

  sql/sql_parse.cc
    1.232 02/06/05 22:05:07 bell@stripped +2 -2
    post-merged fixing

# 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:	bell
# Host:	sanja.is.com.ua
# Root:	/home/bell/mysql/work-select_lex-4.1

--- 1.231/sql/sql_parse.cc	Wed Jun  5 21:32:21 2002
+++ 1.232/sql/sql_parse.cc	Wed Jun  5 22:05:07 2002
@@ -1809,7 +1809,7 @@
       tables->grant.want_privilege=(SELECT_ACL & ~tables->grant.privilege);
       if ((res=open_and_lock_tables(thd,tables)))
 	break;
-      thd->select_limit=HA_POS_ERROR;
+      unit->select_limit_cnt= HA_POS_ERROR;
       if (!setup_fields(thd,tables,select_lex->item_list,1,0,0) && 
 	  !setup_fields(thd,tables,lex->value_list,0,0,0) &&  ! thd->fatal_error &&
 	  (result=new multi_update(thd,tables,select_lex->item_list,lex->duplicates,
@@ -2776,7 +2776,7 @@
 {
   lex->sql_command=  SQLCOM_DELETE_MULTI;
   mysql_init_select(lex);
-  lex->select->select_limit= lex->select->master_union()->select_limit_cnt=
+  lex->select->select_limit= lex->select->master_unit()->select_limit_cnt=
     HA_POS_ERROR;
   lex->auxilliary_table_list= lex->select_lex.table_list;
   lex->select->init_query();

--- 1.166/sql/sql_select.cc	Wed Jun  5 21:09:51 2002
+++ 1.167/sql/sql_select.cc	Wed Jun  5 22:05:07 2002
@@ -2480,7 +2480,7 @@
   join->send_records=(ha_rows) 0;
   join->group=0;
   join->do_send_rows = 1;
-  join->row_limit=join->thd->select_limit;
+  join->row_limit=join->unit->select_limit_cnt;
 
   join_tab->cache.buff=0;			/* No cacheing */
   join_tab->table=tmp_table;
@@ -7119,7 +7119,7 @@
 
   /* Don't log this into the slow query log */
   select_lex->options&= ~(QUERY_NO_INDEX_USED | QUERY_NO_GOOD_INDEX_USED);
-  thd->offset_limit=0;
+  join->unit->offset_limit_cnt= 0;
   if (thd->lex.select == select_lex)
   {
     field_list.push_back(new Item_empty_string("table",NAME_LEN));