List:Internals« Previous MessageNext Message »
From:kent Date:August 26 2005 12:33pm
Subject:bk commit into 5.0 tree (kent:1.1897)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent 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.1897 05/08/26 14:32:38 kent@stripped +2 -0
  Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
  into mysql.com:/Users/kent/mysql/bk/mysql-5.0

  sql/sp_head.cc
    1.173 05/08/26 14:32:34 kent@stripped +0 -0
    Auto merged

  configure.in
    1.339 05/08/26 14:32:33 kent@stripped +0 -0
    Auto merged

# 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:	kent
# Host:	dialup-d2i-62-65-89-202.home.se
# Root:	/Users/kent/mysql/bk/mysql-5.0/RESYNC

--- 1.172/sql/sp_head.cc	2005-08-25 16:14:29 +02:00
+++ 1.173/sql/sp_head.cc	2005-08-26 14:32:34 +02:00
@@ -687,8 +687,12 @@
     /* Find all instances of item_splocal used in this statement */
     for (Item *item= instr->free_list; item; item= item->next)
     {
-      if (item->is_splocal() && ((Item_splocal*)item)->pos_in_query)
-        sp_vars_uses.append((Item_splocal*)item);
+      if (item->is_splocal())
+      {
+        Item_splocal *item_spl= (Item_splocal*)item;
+        if (item_spl->pos_in_query)
+          sp_vars_uses.append(item_spl);
+      }
     }
     if (!sp_vars_uses.elements())
       DBUG_RETURN(0);
Thread
bk commit into 5.0 tree (kent:1.1897)kent26 Aug