diff --git a/.bzrignore b/.bzrignore index bacfe2ff9754003464ef45e641fc03e26be6a7e7..27ee83212895ffe12c31ddd334b3199cd4832d3b 100644 --- a/.bzrignore +++ b/.bzrignore @@ -513,3 +513,6 @@ innobase/stamp-h1 myisam/rt_test.MYD myisam/rt_test.MYI stamp-h1 +libmysqld/sql_help.cc +scripts/fill_func_tables +scripts/fill_func_tables.sql diff --git a/mysql-test/r/derived.result b/mysql-test/r/derived.result index e05be96c6b793e3570f20ecae3cd42d37ee75e67..d3fbd5571563386cf5d19fe46b0841c08abf9978 100644 --- a/mysql-test/r/derived.result +++ b/mysql-test/r/derived.result @@ -18,3 +18,9 @@ a y 3 3 3 3 drop table if exists t1.t2,t3; +select * from (select 1); +1 +1 +select a from (select 1 as a); +a +1 diff --git a/mysql-test/t/derived.test b/mysql-test/t/derived.test index 76ef5fba3515b0de992398a0d0498813def3527c..87910c2970620714f2d3b92b0ecf9759735248c1 100644 --- a/mysql-test/t/derived.test +++ b/mysql-test/t/derived.test @@ -9,3 +9,5 @@ CREATE TABLE t3 (a int not null, b char (10) not null); insert into t3 values (3,'f'),(4,'y'),(5,'z'),(6,'c'); select t1.a,t4.y from t1,(select t2.a as y from t2,(select t3.b from t3 where t3.a>3) as t5 where t2.b=t5.b) as t4 where t1.a = t4.y; drop table if exists t1.t2,t3; +select * from (select 1); +select a from (select 1 as a);