bk commit into 5.0 tree (sergefp:1.1880) BUG#10107

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
5.0 repository of psergey. When psergey 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.1880 05/04/23 06:55:43 sergefp@stripped +1 -0
  Fix for BUG#10107: Memory leak in view over subquery:
  In mysql_make_view when joining subquery lists, take into account that both lists
  can have length > 1 (see also fix for BUG#8490) 
  (note to bk trigger: this commit is about BUG#10107)

  sql/sql_view.cc
    1.43 05/04/23 06:55:39 sergefp@stripped +4 -2
    Fix for BUG#10107: In mysql_make_view, when joining subquery lists, take into account 
    that both lists can have length > 1 (see also fix for BUG#8490) 

# 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:	sergefp
# Host:	newbox.mylan
# Root:	/home/psergey/mysql-5.0-bug8490-2

--- 1.42/sql/sql_view.cc	2005-04-23 00:13:42 +04:00
+++ 1.43/sql/sql_view.cc	2005-04-23 06:55:39 +04:00
@@ -808,13 +808,15 @@
         NOTE: we do not support UNION here, so we take only one select
       */
       SELECT_LEX_NODE *end_unit= table->select_lex->slave;
+      SELECT_LEX_UNIT *next_unit;
       for (SELECT_LEX_UNIT *unit= lex->select_lex.first_inner_unit();
            unit;
-           unit= unit->next_unit())
+           unit= next_unit)
       {
-        SELECT_LEX_NODE *save_slave= unit->slave;
         if (unit == end_unit)
           break;
+        SELECT_LEX_NODE *save_slave= unit->slave;
+        next_unit= unit->next_unit();
         unit->include_down(table->select_lex);
         unit->slave= save_slave; // fix include_down initialisation
       }