From 90b6af3da0ede518fbd4e31c5078e0dba53bc67e Mon Sep 17 00:00:00 2001
From: "Sinisa@sinisa.nasamreza.org" <>
Date: Sat, 31 May 2003 18:31:57 +0300
Subject: Fix for the optimiser problem caused by the fact that with derived
 tables one (or more tables) is opened / closed twice.

---
 mysql-test/r/derived.result | 2 +-
 sql/sql_derived.cc          | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/derived.result b/mysql-test/r/derived.result
index bfd4c544131..52a54ac7773 100644
--- a/mysql-test/r/derived.result
+++ b/mysql-test/r/derived.result
@@ -137,7 +137,7 @@ a	t
 explain select count(*) from t1 as tt1, (select * from t1) as tt2;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Select tables optimized away
-2	DERIVED	tt1	index	NULL	a	4	NULL	10000	Using index
+2	DERIVED	tt1	ALL	NULL	NULL	NULL	NULL	10000	
 drop table t1;
 SELECT * FROM (SELECT (SELECT * FROM (SELECT 1 as a) as a )) as b;
 (SELECT * FROM (SELECT 1 as a) as a )
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc
index 7f555f37d40..66b8048996f 100644
--- a/sql/sql_derived.cc
+++ b/sql/sql_derived.cc
@@ -219,6 +219,8 @@ int mysql_derived(THD *thd, LEX *lex, SELECT_LEX_UNIT *unit,
       /* Add new temporary table to list of open derived tables */
       table->next= thd->derived_tables;
       thd->derived_tables= table;
+      thd->query_id++;
+      query_id++;
     }
 
 exit:
-- 
cgit v1.2.1