summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <Sinisa@sinisa.nasamreza.org>2005-05-18 19:43:48 +0300
committerunknown <Sinisa@sinisa.nasamreza.org>2005-05-18 19:43:48 +0300
commita217404883825b5f676ab27d39980345d5ae667b (patch)
tree4eb5ef875f4e3c7b53695ff7380e98099575db78 /sql
parent0a2b07254f85b9e3a1a5a4bc52bb44957006cc31 (diff)
parent2f9c6377f02f9499115f40eceaf8a5247a742068 (diff)
downloadmariadb-git-a217404883825b5f676ab27d39980345d5ae667b.tar.gz
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_yacc.yy2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 2edad446499..d8a2c997bf8 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -2449,7 +2449,7 @@ select_part2:
select_into select_lock_type;
select_into:
- opt_limit_clause {}
+ opt_order_clause opt_limit_clause {}
| into
| select_from
| into select_from