bk commit into 5.1 tree (cmiller:1.2585)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.1 repository of cmiller.  When cmiller 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, 2008-03-31 18:29:24-04:00, cmiller@stripped +1 -0
  testing

  sql/sql_yacc.yy@stripped, 2008-03-31 18:29:21-04:00, cmiller@stripped +10 -4
    testing

diff -Nrup a/sql/sql_yacc.yy b/sql/sql_yacc.yy
--- a/sql/sql_yacc.yy	2008-03-31 16:07:18 -04:00
+++ b/sql/sql_yacc.yy	2008-03-31 18:29:21 -04:00
@@ -1278,7 +1278,7 @@ bool my_yyoverflow(short **a, YYSTYPE **
         union_clause union_list
         precision subselect_start opt_and charset
         subselect_end select_var_list select_var_list_init help 
-        opt_field_length field_length
+        field_length opt_field_length
         opt_extended_describe
         prepare prepare_src execute deallocate
         statement sp_suid
@@ -4629,7 +4629,7 @@ field_spec:
         ;
 
 type:
-          int_type opt_len field_options { $$=$1; }
+          int_type opt_field_length field_options { $$=$1; }
         | real_type opt_precision field_options { $$=$1; }
         | FLOAT_SYM float_options field_options { $$=MYSQL_TYPE_FLOAT; }
         | BIT_SYM
@@ -4849,7 +4849,7 @@ float_options:
           /* empty */
           { Lex->dec=Lex->length= (char*)0; }
         | field_length
-          { Lex->length=$2.str; Lex->dec= (char*)0; }
+          { Lex->dec= (char*)0; }
         | precision
           {}
         ;
@@ -4879,9 +4879,15 @@ field_option:
         | ZEROFILL { Lex->type|= UNSIGNED_FLAG | ZEROFILL_FLAG; }
         ;
 
+field_length:
+          '(' LONG_NUM ')'      { Lex->length= $2.str; }
+        | '(' ULONGLONG_NUM ')' { Lex->length= $2.str; }
+        | '(' DECIMAL_NUM ')'   { Lex->length= $2.str; }
+        | '(' NUM ')'           { Lex->length= $2.str; };
+
 opt_field_length:
           /* empty */  { Lex->length=(char*) 0; /* use default length */ }
-        | field_length { Lex->length= $2.str; }
+        | field_length { }
         ;
 
 opt_precision: