diff options
| author | Sinisa@sinisa.nasamreza.org <> | 2003-06-10 15:21:19 +0300 |
|---|---|---|
| committer | Sinisa@sinisa.nasamreza.org <> | 2003-06-10 15:21:19 +0300 |
| commit | 19a17f602fc42f596271bd80a586c530ee3722d5 (patch) | |
| tree | 15d15073339d3d0ed4c2bcebd8993980b67e7f77 | |
| parent | 5b9db529667d46e6f832e130df35430cdf60660f (diff) | |
| parent | dcc65e0aa7f396ca465ef04dde80391434aa2bd3 (diff) | |
| download | mariadb-git-19a17f602fc42f596271bd80a586c530ee3722d5.tar.gz | |
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
| -rw-r--r-- | mysql-test/r/derived.result | 2 | ||||
| -rw-r--r-- | sql/sql_derived.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/r/derived.result b/mysql-test/r/derived.result index 5f405d83fa5..61937ba9266 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 2bf1a68e504..b2a055b3ee5 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -223,6 +223,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: |