[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mysql-internals
Subject:    bk commit into 4.1 tree (1.1590)
From:       sinisa () mysql ! com
Date:       2003-08-30 14:13:15
[Download RAW message or body]

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.1590 03/08/30 17:13:10 Sinisa@sinisa.nasamreza.org +1 -0
  Fix for a compilation problem with VC++

  sql/sql_union.cc
    1.94 03/08/30 17:13:03 Sinisa@sinisa.nasamreza.org +3 -3
    Fix for a compilation problem with VC++

# 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.93/sql/sql_union.cc	Wed Aug 27 15:32:48 2003
+++ 1.94/sql/sql_union.cc	Sat Aug 30 17:13:03 2003
@@ -116,7 +116,7 @@
 				bool tables_and_fields_initied)
 {
   SELECT_LEX *lex_select_save= thd->lex.current_select;
-  SELECT_LEX *select_cursor;
+  SELECT_LEX *select_cursor,*sl;
   DBUG_ENTER("st_select_lex_unit::prepare");
 
   if (prepared)
@@ -130,7 +130,7 @@
   t_and_f= tables_and_fields_initied;
   
   bzero((char *)&tmp_table_param,sizeof(TMP_TABLE_PARAM));
-  thd->lex.current_select= select_cursor= first_select_in_union();
+  thd->lex.current_select= sl= select_cursor= first_select_in_union();
   /* Global option */
   if (t_and_f)
   {
@@ -185,7 +185,7 @@
   union_result->not_describe=1;
   union_result->tmp_table_param=tmp_table_param;
 
-  for (SELECT_LEX *sl= select_cursor; sl; sl= sl->next_select())
+  for (;sl; sl= sl->next_select())
   {
     JOIN *join= new JOIN(thd, sl->item_list, 
 			 sl->options | thd->options | SELECT_NO_UNLOCK,

-- 
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe:    http://lists.mysql.com/internals?unsub=mysql-internals@progressive-comp.com

[prev in list] [next in list] [prev in thread] [next in thread]