List:Internals« Previous MessageNext Message »
From:sinisa Date:August 27 2003 12:32pm
Subject:bk commit into 4.1 tree (1.1585)
View as plain text  
Below is the list of changes that have just been committed into a local
4.1 repository of Sinisa. When Sinisa 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1585 03/08/27 15:32:52 Sinisa@stripped +1 -0
  Merge fixes

  sql/sql_union.cc
    1.93 03/08/27 15:32:48 Sinisa@stripped +25 -28
    Some further 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:	Sinisa
# Host:	sinisa.nasamreza.org
# Root:	/mnt/work/mysql-4.1

--- 1.92/sql/sql_union.cc	Wed Aug 27 15:24:13 2003
+++ 1.93/sql/sql_union.cc	Wed Aug 27 15:32:48 2003
@@ -187,34 +187,31 @@
 
   for (SELECT_LEX *sl= select_cursor; sl; sl= sl->next_select())
   {
-    for (SELECT_LEX *sl= select_cursor; sl; sl= sl->next_select())
-    {
-      JOIN *join= new JOIN(thd, sl->item_list, 
-			   sl->options | thd->options | SELECT_NO_UNLOCK,
-			   union_result);
-      thd->lex.current_select= sl;
-      offset_limit_cnt= sl->offset_limit;
-      select_limit_cnt= sl->select_limit+sl->offset_limit;
-      if (select_limit_cnt < sl->select_limit)
-	select_limit_cnt= HA_POS_ERROR;		// no limit
-      if (select_limit_cnt == HA_POS_ERROR || sl->braces)
-	sl->options&= ~OPTION_FOUND_ROWS;
-      
-      res= join->prepare(&sl->ref_pointer_array,
-			 (TABLE_LIST*) sl->table_list.first, sl->with_wild,
-			 sl->where,
-			 ((sl->braces) ? sl->order_list.elements : 0) +
-			 sl->group_list.elements,
-			 (sl->braces) ? 
-			 (ORDER *)sl->order_list.first : (ORDER *) 0,
-			 (ORDER*) sl->group_list.first,
-			 sl->having,
-			 (ORDER*) NULL,
-			 sl, this, t_and_f);
-      t_and_f= 0;
-      if (res || thd->is_fatal_error)
-	goto err;
-    }
+    JOIN *join= new JOIN(thd, sl->item_list, 
+			 sl->options | thd->options | SELECT_NO_UNLOCK,
+			 union_result);
+    thd->lex.current_select= sl;
+    offset_limit_cnt= sl->offset_limit;
+    select_limit_cnt= sl->select_limit+sl->offset_limit;
+    if (select_limit_cnt < sl->select_limit)
+      select_limit_cnt= HA_POS_ERROR;		// no limit
+    if (select_limit_cnt == HA_POS_ERROR || sl->braces)
+      sl->options&= ~OPTION_FOUND_ROWS;
+    
+    res= join->prepare(&sl->ref_pointer_array,
+		       (TABLE_LIST*) sl->table_list.first, sl->with_wild,
+		       sl->where,
+		       ((sl->braces) ? sl->order_list.elements : 0) +
+		       sl->group_list.elements,
+		       (sl->braces) ? 
+		       (ORDER *)sl->order_list.first : (ORDER *) 0,
+		       (ORDER*) sl->group_list.first,
+		       sl->having,
+		       (ORDER*) NULL,
+		       sl, this, t_and_f);
+    t_and_f= 0;
+    if (res || thd->is_fatal_error)
+      goto err;
   }
 
   item_list.empty();
Thread
bk commit into 4.1 tree (1.1585)sinisa27 Aug