From 0c5b323d0f534605df9d6f8dc93a7044decccff2 Mon Sep 17 00:00:00 2001
From: "bell@sanja.is.com.ua" <>
Date: Tue, 28 Jan 2003 14:48:12 +0200
Subject: fixed bugs in temporary tables in subselect implementation (SCRUM)
 merging with switching on static tables optimization (SCRUM) fixed subselects
 with uncacheable results added test for fixed bugs from bugreports

---
 sql/sql_union.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sql/sql_union.cc')

diff --git a/sql/sql_union.cc b/sql/sql_union.cc
index ffd6ac48c2c..259f6dbb4b5 100644
--- a/sql/sql_union.cc
+++ b/sql/sql_union.cc
@@ -207,11 +207,11 @@ int st_select_lex_unit::exec()
   DBUG_ENTER("st_select_lex_unit::exec");
   SELECT_LEX_NODE *lex_select_save= thd->lex.current_select;
   
-  if (executed && !dependent)
+  if (executed && !(dependent||uncacheable))
     DBUG_RETURN(0);
   executed= 1;
   
-  if (dependent || !item || !item->assigned())
+  if ((dependent||uncacheable) || !item || !item->assigned())
   {
     if (optimized && item && item->assigned())
     {
-- 
cgit v1.2.1