Commit 93624f3c authored by unknown's avatar unknown
Browse files

Fix for NCHAR bug appeared during the merging 


BitKeeper/etc/ignore:
  Added libmysqld/my_decimal.cc to the ignore list
sql/sql_yacc.yy:
  Lex->dec initialization added
parent f4eef98e

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -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

sql/sql_yacc.yy

+1 −1
Original line number Diff line number Diff line
@@ -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; }