Commit f2ebd8b1 authored by unknown's avatar unknown
Browse files

Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/timka/mysql/src/4.1-virgin
parents 41780a75 d5023070

mysql-test/r/limit.result

+9 −0
Original line number Diff line number Diff line
@@ -67,3 +67,12 @@ SELECT * FROM t1; 
id	id2

3	0

DROP TABLE t1;

create table t1 (a integer);

insert into t1 values (1);

select 1 as a from t1 union all select 1 from dual limit 1;

a

1

(select 1 as a from t1) union all (select 1 from dual) limit 1;

a

1

drop table t1;

mysql-test/t/limit.test

+10 −0
Original line number Diff line number Diff line
@@ -49,3 +49,13 @@ SELECT * FROM t1; 
DELETE FROM t1 WHERE id2 = 0 ORDER BY id desc LIMIT 1; 

SELECT * FROM t1;

DROP TABLE t1;



#

# Bug#8023 - limit on UNION with from DUAL, causes syntax error

#

create table t1 (a integer);

insert into t1 values (1);

# both queries must return one row

select 1 as a from t1 union all select 1 from dual limit 1;

(select 1 as a from t1) union all (select 1 from dual) limit 1;

drop table t1;

sql/sql_yacc.yy

+5 −4
Original line number Diff line number Diff line
@@ -2455,10 +2455,11 @@ select_into: 
select_from:

	  FROM join_table_list where_clause group_clause having_clause

	       opt_order_clause opt_limit_clause procedure_clause

        | FROM DUAL_SYM /* oracle compatibility: oracle always requires FROM

                           clause, and DUAL is system table without fields.

                           Is "SELECT 1 FROM DUAL" any better than

                           "SELECT 1" ? Hmmm :) */

        | FROM DUAL_SYM opt_limit_clause

          /* oracle compatibility: oracle always requires FROM clause,

             and DUAL is system table without fields.

             Is "SELECT 1 FROM DUAL" any better than "SELECT 1" ?

          Hmmm :) */

	;



select_options: