bk commit into 5.1 tree (malff:1.2405)

[marc.alff]

Below is the list of changes that have just been committed into a local
5.1 repository of marcsql. When marcsql does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-01-18 09:27:43-07:00, malff@weblab.(none) +3 -0
  Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-24562
  into  weblab.(none):/home/marcsql/TREE/mysql-5.1-24562
  MERGE: 1.1810.2443.1

  mysql-test/r/alter_table.result@stripped, 2007-01-18 09:27:26-07:00, malff@weblab.(none) +0
-113
    MERGE: 1.49.1.12

  mysql-test/t/alter_table.test@stripped, 2007-01-18 09:27:38-07:00, malff@weblab.(none) +0
-67
    MERGE: 1.36.1.12

  sql/sql_yacc.yy@stripped, 2007-01-18 09:25:57-07:00, malff@weblab.(none) +0 -0
    Auto merged
    MERGE: 1.371.1.131

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	malff
# Host:	weblab.(none)
# Root:	/home/marcsql/TREE/mysql-5.1-24562/RESYNC

--- 1.533/sql/sql_yacc.yy	2007-01-18 09:27:48 -07:00
+++ 1.534/sql/sql_yacc.yy	2007-01-18 09:27:48 -07:00
@@ -5425,7 +5425,7 @@ alter_list_item:
 	  {
 	    Lex->alter_info.flags|= ALTER_FORCE;
 	   }
-	| order_clause
+	| alter_order_clause
 	  {
 	    LEX *lex=Lex;
 	    lex->alter_info.flags|= ALTER_ORDER;
@@ -7568,6 +7568,29 @@ olap_opt:
 	    lex->current_select->olap= ROLLUP_TYPE;
 	  }
 	;
+
+/*
+  Order by statement in ALTER TABLE
+*/
+
+alter_order_clause:
+          ORDER_SYM BY alter_order_list
+        ;
+
+alter_order_list:
+          alter_order_list ',' alter_order_item
+        | alter_order_item
+        ;
+
+alter_order_item:
+          simple_ident_nospvar order_dir
+          {
+            THD *thd= YYTHD;
+            bool ascending= ($2 == 1) ? true : false;
+            if (add_order_to_list(thd, $1, ascending))
+              YYABORT;
+          }
+        ;
 
 /*
    Order by statement in select