diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2005-05-18 15:28:13 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2005-05-18 15:28:13 +0300 |
| commit | 2f9c6377f02f9499115f40eceaf8a5247a742068 (patch) | |
| tree | 62fb1fdb567149c364b376161a4a6160ce34a76b /sql | |
| parent | fce1521033206932e71d7ecf7c07dd82f8238200 (diff) | |
| parent | 783705fc65080e9f1bdc8659f0a792f61069abe0 (diff) | |
| download | mariadb-git-2f9c6377f02f9499115f40eceaf8a5247a742068.tar.gz | |
Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_yacc.yy | 2 |
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 |