diff options
| author | unknown <joerg@mysql.com> | 2005-05-26 12:51:44 +0200 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-05-26 12:51:44 +0200 |
| commit | 96f629db87b4c790f980dfeb539c8ddea0901354 (patch) | |
| tree | eaa4a697ce366f6da89001d3d3eaa62af2a7483b /sql/sql_yacc.yy | |
| parent | f0f9b5959eecb87b369fc45c981d926b79de0c61 (diff) | |
| parent | 7e5651ca17706473c3ea791db48a08c849181f1c (diff) | |
| download | mariadb-git-96f629db87b4c790f980dfeb539c8ddea0901354.tar.gz | |
Manual merge.
client/mysqldump.c:
Auto merged
include/my_global.h:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
sql/item.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
support-files/mysql.spec.sh:
Auto merged
client/client_priv.h:
Manual merge (still to be corrected!)
Diffstat (limited to 'sql/sql_yacc.yy')
| -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 99b0f43db2d..e01b9cfe9ca 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -3968,7 +3968,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 |