diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-09-16 12:14:40 +0500 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-09-16 12:14:40 +0500 |
| commit | 0ebd55fc24ad76c800814f1124dfba900060ad97 (patch) | |
| tree | eb606d6db5828543eecbbe0bdc87e2c362973649 /sql/sql_yacc.yy | |
| parent | 81466771e4f1f90f479dd3bcffdf44e7800d983d (diff) | |
| download | mariadb-git-0ebd55fc24ad76c800814f1124dfba900060ad97.tar.gz | |
Bug fix:
http://bugs.mysql.com/bug.php?id=1129
From: Georg Richter
Description: there is a problem with special chars like umlauts in comments
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 35d589156c8..6491dd6cad1 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1199,7 +1199,8 @@ field_spec: { LEX *lex=Lex; lex->length=lex->dec=0; lex->type=0; lex->interval=0; - lex->default_value=lex->comment=0; + lex->default_value=0; + lex->comment=0; lex->charset=NULL; } type opt_attribute @@ -1411,7 +1412,7 @@ 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_STRING_sys { Lex->comment= &$2; } | COLLATE_SYM collation_name { if (Lex->charset && !my_charset_same(Lex->charset,$2)) @@ -1668,7 +1669,8 @@ alter_list_item: { LEX *lex=Lex; lex->length=lex->dec=0; lex->type=0; lex->interval=0; - lex->default_value=lex->comment=0; + lex->default_value=0; + lex->comment=0; lex->charset= NULL; lex->simple_alter=0; } |