diff options
author | unknown <monty@mashka.mysql.fi> | 2002-12-14 17:49:01 +0200 |
---|---|---|
committer | unknown <monty@mashka.mysql.fi> | 2002-12-14 17:49:01 +0200 |
commit | 5a9437ac05635aae57fabbfb54d655b92942486a (patch) | |
tree | 83ced56eeeb8e8fc8c70477eb454d5e43fb8cb56 /mysql-test/r/derived.result | |
parent | c9fd2749f7628969ec0a83e86add7b6b2420fd89 (diff) | |
parent | f935c6a2861414dac42b77c80010881ca674b1f0 (diff) | |
download | mariadb-git-5a9437ac05635aae57fabbfb54d655b92942486a.tar.gz |
merge
mysql-test/r/derived.result:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/func_str.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/derived.result')
-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 94977b4f2f0..03e00b206b2 100644 --- a/mysql-test/r/derived.result +++ b/mysql-test/r/derived.result @@ -114,7 +114,7 @@ a t 20 20 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 Select tables optimized away +1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Select tables optimized away 2 DERIVED tt1 index NULL a 4 NULL 10000 Using index drop table if exists t1; SELECT * FROM (SELECT (SELECT * FROM (SELECT 1 as a) as a )) as b; |