diff options
author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-05-31 18:38:41 +0300 |
---|---|---|
committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-05-31 18:38:41 +0300 |
commit | 3c10f3bc1292785aef88211cc97a676a57a29362 (patch) | |
tree | d6e346c7033909806289e9a68740c2f44da17924 /mysql-test | |
parent | 8b7e79be78b9d570ca303a7a601d7f3226b72171 (diff) | |
parent | c47c56452680e1bbdaa9d8ed4203470cf7f02c56 (diff) | |
download | mariadb-git-3c10f3bc1292785aef88211cc97a676a57a29362.tar.gz |
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
sql/sql_derived.cc:
Auto merged
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/r/derived.result | 2 |
1 files changed, 1 insertions, 1 deletions
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 ) |