merge

Docs/manual.texi:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
sql/stacktrace.c:
  Auto merged
mysql-test/r/group_by.result:
  To be corrected..

1 files changed, 8 insertions, 11 deletions

diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index a4be2567315..ca8421aeaa2 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -509,7 +509,7 @@ bool my_yyoverflow(short **a, YYSTYPE **b,int *yystacksize);
 	ulonglong_num
 
 %type <item>
-	literal text_literal insert_ident group_ident order_ident
+	literal text_literal insert_ident order_ident
 	simple_ident select_item2 expr opt_expr opt_else sum_expr in_sum_expr
 	table_wild opt_pad no_in_expr expr_expr simple_expr no_and_expr
 	using_list
@@ -2071,10 +2071,10 @@ group_clause:
 	| GROUP BY group_list
 
 group_list:
-	group_list ',' group_ident
-	  { if (add_group_to_list($3,(bool) 1)) YYABORT; }
-	| group_ident
-	  { if (add_group_to_list($1,(bool) 1)) YYABORT; }
+	group_list ',' order_ident order_dir
+	  { if (add_group_to_list($3,(bool) $4)) YYABORT; }
+	| order_ident order_dir
+	  { if (add_group_to_list($1,(bool) $2)) YYABORT; }
 
 /*
 ** Order by statement in select
@@ -2085,7 +2085,7 @@ opt_order_clause:
 	| order_clause
 
 order_clause:
-	ORDER_SYM BY { Select->sort_default=1; } order_list
+	ORDER_SYM BY order_list
 
 order_list:
 	order_list ',' order_ident order_dir
@@ -2095,8 +2095,8 @@ order_list:
 
 order_dir:
 	/* empty */ { $$ =  1; }
-	| ASC  { $$ = Select->sort_default=1; }
-	| DESC { $$ = Select->sort_default=0; }
+	| ASC  { $$ =1; }
+	| DESC { $$ =0; }
 
 
 limit_clause:
@@ -2815,9 +2815,6 @@ table_wild:
 	| ident '.' ident '.' '*'
 	{ $$ = new Item_field((current_thd->client_capabilities & CLIENT_NO_SCHEMA ? NullS : $1.str),$3.str,"*"); }
 
-group_ident:
-	order_ident order_dir
-
 order_ident:
 	expr { $$=$1; }