added FROM DUAL for derived tables

2002-12-26 17:48:19 +02:00 · 2002-12-26 17:48:19 +02:00 · 5265a1656e
commit 5265a1656e
parent 717656bb1c
3 changed files with 5 additions and 0 deletions
--- a/mysql-test/r/derived.result
+++ b/mysql-test/r/derived.result
@ -1,3 +1,6 @@
+select * from (select 2 from DUAL) b;
+2
+2
 SELECT 1 as a FROM (SELECT 1 UNION SELECT a) b;
 Unknown column 'a' in 'field list'
 SELECT 1 as a FROM (SELECT a UNION SELECT 1) b;
--- a/mysql-test/t/derived.test
+++ b/mysql-test/t/derived.test
@ -1,3 +1,4 @@
+select * from (select 2 from DUAL) b;
 -- error 1054
 SELECT 1 as a FROM (SELECT 1 UNION SELECT a) b;
 -- error 1054
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@ -997,6 +997,7 @@ merge_insert_types:

 opt_select_from:
 	opt_limit_clause {}
+	| FROM DUAL_SYM {}
 	| select_from select_lock_type;

 udf_func_type: