From: Date: March 30 2006 9:34pm
Subject: bk commit into 5.0 tree (igor:1.2124)
List-Archive: http://lists.mysql.com/commits/4340
Message-Id: <20060330193424.EDF682DD42@rurik.mysql.com>

Below is the list of changes that have just been committed into a local
5.0 repository of igor. When igor 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.2124 06/03/30 11:34:14 igor@stripped +1 -0
  Merge rurik.mysql.com:/home/igor/mysql-5.0
  into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0

  sql/sql_select.cc
    1.402 06/03/30 11:34:07 igor@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:	igor
# Host:	rurik.mysql.com
# Root:	/home/igor/dev/mysql-5.0-0/RESYNC

--- 1.401/sql/sql_select.cc	2006-03-30 07:02:57 -08:00
+++ 1.402/sql/sql_select.cc	2006-03-30 11:34:07 -08:00
@@ -7469,7 +7469,7 @@
       */
       if (table->on_expr)
       {
-        Item *expr= table->prep_on_expr ? table->prep_on_expr : table->on_expr;
+        Item *expr= table->on_expr;
         /* 
            If an on expression E is attached to the table, 
            check all null rejected predicates in this expression.
@@ -7480,7 +7480,9 @@
 	*/ 
         expr= simplify_joins(join, &nested_join->join_list,
                              expr, FALSE);
-        table->prep_on_expr= table->on_expr= expr;
+        table->on_expr= expr;
+        if (!table->prep_on_expr)
+          table->prep_on_expr= expr->copy_andor_structure(join->thd);
       }
       nested_join->used_tables= (table_map) 0;
       nested_join->not_null_tables=(table_map) 0;