diff options
author | unknown <gluh@gluh.mysql.r18.ru> | 2005-02-07 11:57:14 +0300 |
---|---|---|
committer | unknown <gluh@gluh.mysql.r18.ru> | 2005-02-07 11:57:14 +0300 |
commit | 2359f1fa3ee8bf697ad52a1a05dfc8910f3f1f2f (patch) | |
tree | b781287b8eacad029c1a729fa23cb8786b5ce69f /sql/sql_yacc.yy | |
parent | 02fadb6d7cbae974dcf82309c896649e04299cee (diff) | |
parent | e7bac81f01d05a54f1467690be58198f42aef47c (diff) | |
download | mariadb-git-2359f1fa3ee8bf697ad52a1a05dfc8910f3f1f2f.tar.gz |
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r-- | sql/sql_yacc.yy | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index a94fb31580c..1402a85229b 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -3895,10 +3895,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: |