bk commit into 5.0 tree (konstantin:1.2013)

[konstantin]

Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja 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.2013 05/06/24 23:29:00 konstantin@stripped +1 -0
  Remove an unrelevant assert.

  sql/sql_select.cc
    1.351 05/06/24 23:28:51 konstantin@stripped +0 -6
    This assert is not relevant because:
    - the correct assert is DBUG_ASSERT(! (full && sl->uncacheable)) 
      (prevents freeing of uncacheable JOINs), it breaks view.test
    - it seems we can free internal JOINs, even if they are uncacheable:
      if the top level join is evaluated, we're not going to need  the
      internal joins any more

# 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:	konstantin
# Host:	dragonfly.local
# Root:	/opt/local/work/mysql-5.0-join_free2push

--- 1.350/sql/sql_select.cc	2005-06-24 22:48:44 +04:00
+++ 1.351/sql/sql_select.cc	2005-06-24 23:28:51 +04:00
@@ -5912,13 +5912,7 @@
     {
       JOIN *join= sl->join;
       if (join)
-      {
-        /* Check that we don't occasionally clean up an uncacheable JOIN */
-#if 0
-        DBUG_ASSERT(! (!select_lex->uncacheable && sl->uncacheable));
-#endif
         join->join_free(full);
-      }
     }
 
   /*