diff options
| author | hf@deer.(none) <> | 2005-02-09 16:34:03 +0400 |
|---|---|---|
| committer | hf@deer.(none) <> | 2005-02-09 16:34:03 +0400 |
| commit | dca227bac6b1f67b2724a3303d29044573e593cd (patch) | |
| tree | ca5d127200d6cf9b655b0a55e0bf21545ed495e2 /sql | |
| parent | a995633ab70482ea6c822df4a4ab5826925d801d (diff) | |
| parent | 2f7f2dfe5da91d1a62a6f82be0f014d9460ea6fc (diff) | |
| download | mariadb-git-dca227bac6b1f67b2724a3303d29044573e593cd.tar.gz | |
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_yacc.yy | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 96c9c39d8d6..c4649c57269 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -4817,7 +4817,7 @@ in_sum_expr: cast_type: BINARY opt_len { $$=ITEM_CAST_CHAR; Lex->charset= &my_charset_bin; Lex->dec= 0; } | CHAR_SYM opt_len opt_binary { $$=ITEM_CAST_CHAR; Lex->dec= 0; } - | NCHAR_SYM opt_len { $$=ITEM_CAST_CHAR; Lex->charset= national_charset_info; } + | NCHAR_SYM opt_len { $$=ITEM_CAST_CHAR; Lex->charset= national_charset_info; Lex->dec=0; } | SIGNED_SYM { $$=ITEM_CAST_SIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; } | SIGNED_SYM INT_SYM { $$=ITEM_CAST_SIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; } | UNSIGNED { $$=ITEM_CAST_UNSIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; } |