Merge abarkov@work.mysql.com:/home/bk/mysql-4.1

into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1

Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
ba8a9d41 · bar@bar.mysql.r18.ru · c1842a98 · 7e13f78a · ba8a9d41
Commit ba8a9d41 authored Jan 08, 2003 by bar@bar.mysql.r18.ru
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sql/sql_yacc.yy sql/sql_yacc.yy +2 -2

No files found.
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -1231,7 +1231,8 @@ attribute:
 	| opt_primary KEY_SYM { Lex->type|= PRI_KEY_FLAG | NOT_NULL_FLAG; }
 	| UNIQUE_SYM	  { Lex->type|= UNIQUE_FLAG; }
 	| UNIQUE_SYM KEY_SYM { Lex->type|= UNIQUE_KEY_FLAG; }
-	| COMMENT_SYM text_literal { Lex->comment= $2; };
+	| COMMENT_SYM text_literal { Lex->comment= $2; }
+	| COLLATE_SYM charset_name { Lex->charset=$2; };


 charset_name:
@@ -1278,7 +1279,6 @@ opt_binary:
 	    YYABORT;
 	  }
 	}
-	| COLLATE_SYM charset_name	{ Lex->charset=$2; }
 	| CHAR_SYM SET charset_name	{ Lex->charset=$3; } ;

 opt_primary: