diff options
| author | unknown <monty@donna.mysql.com> | 2001-02-13 12:39:50 +0200 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2001-02-13 12:39:50 +0200 |
| commit | 01eff509a044abb9ccf28026ee5c41d8a59afc18 (patch) | |
| tree | bb589eb1ed2f26d8db4af6466b490a3476f7e401 /sql/sql_yacc.yy | |
| parent | a00ef17fdbfeb033c8a1030f3af38b9b687a505f (diff) | |
| download | mariadb-git-01eff509a044abb9ccf28026ee5c41d8a59afc18.tar.gz | |
Added --replace to mysqltest
Fixed that GROUP BY can take DESC
Docs/manual.texi:
Cleanups
client/mysqltest.c:
Added --replace to mysqltest
mysql-test/t/backup.test:
Fix to handle different error codes from backup table
sql-bench/crash-me.sh:
Fixed error in create_index test
sql/item_func.cc:
Cleanup
sql/sql_yacc.yy:
Fixed that GROUP BY can take DESC
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 56c8fa2557e..64d3de34d3e 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1841,9 +1841,9 @@ group_clause: group_list: group_list ',' group_ident - { if (add_group_to_list($3,(bool) 1)) YYABORT; } - | group_ident order_dir - { if (add_group_to_list($1,(bool) 1)) YYABORT; } + { if (add_group_to_list($3,(bool) 1)) YYABORT; } + | group_ident + { if (add_group_to_list($1,(bool) 1)) YYABORT; } /* ** Order by statement in select @@ -2410,7 +2410,7 @@ table_wild: { $$ = new Item_field((current_thd->client_capabilities & CLIENT_NO_SCHEMA ? NullS : $1.str),$3.str,"*"); } group_ident: - order_ident + order_ident order_dir order_ident: expr { $$=$1; } |