From 024d232af5baef385f3c2fbe23bbab0ffb55620a Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 24 Jun 2005 23:29:00 +0400 Subject: [PATCH] Remove an unrelevant assert. sql/sql_select.cc: 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 --- sql/sql_select.cc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 6feb495c940..da89fdf1675 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -5912,13 +5912,7 @@ void JOIN::join_free(bool full) { 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); - } } /*