summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <timour@mysql.com>2005-02-02 09:55:41 +0200
committerunknown <timour@mysql.com>2005-02-02 09:55:41 +0200
commit6fd984d59224b9227f681137278f4d4149c98926 (patch)
treebc79d532fe6fd237d4abbc8791b393808f00004b /sql
parent1a2ef2be00e8cbe8ec7f043cb8ce50717bf024cf (diff)
parentd81a0bede23ca74222252b6f43bd85ead5d7be2a (diff)
downloadmariadb-git-6fd984d59224b9227f681137278f4d4149c98926.tar.gz
Merge mysql.com:/home/timka/mysql/src/4.1-dbg
into mysql.com:/home/timka/mysql/src/4.1-bug-8023
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_yacc.yy9
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 1e51d8fb82d..e70efe14557 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -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: