diff options
| -rw-r--r-- | .bzrignore | 1 | ||||
| -rw-r--r-- | sql/sql_yacc.yy | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore index 0d352209a08..b6b5d0a613f 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1059,3 +1059,4 @@ support-files/ndb-config-2-node.ini client/decimal.c client/my_decimal.cc client/my_decimal.h +libmysqld/my_decimal.cc 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; } |