summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bzrignore3
-rw-r--r--mysql-test/r/derived.result6
-rw-r--r--mysql-test/t/derived.test2
3 files changed, 11 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore
index bacfe2ff975..27ee8321289 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 e05be96c6b7..d3fbd557156 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 76ef5fba351..87910c29706 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);