Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into deer.(none):/home/hf/work/mysql-5.0.clean
This commit is contained in:
commit
dca227bac6
16
.bzrignore
16
.bzrignore
@ -254,11 +254,14 @@ bkpush.log
|
||||
bkpush.log*
|
||||
build.log
|
||||
build_tags.sh
|
||||
client/decimal.c
|
||||
client/insert_test
|
||||
client/log_event.cc
|
||||
client/log_event.h
|
||||
client/mf_iocache.c
|
||||
client/mf_iocache.cc
|
||||
client/my_decimal.cc
|
||||
client/my_decimal.h
|
||||
client/mysql
|
||||
client/mysqladmin
|
||||
client/mysqladmin.c
|
||||
@ -328,9 +331,12 @@ help.h
|
||||
include/my_config.h
|
||||
include/my_global.h
|
||||
include/mysql_version.h
|
||||
include/mysqld_ername.h
|
||||
include/mysqld_error.h
|
||||
include/readline
|
||||
include/readline/*.h
|
||||
include/readline/readline.h
|
||||
include/sql_state.h
|
||||
include/widec.h
|
||||
innobase/autom4te-2.53.cache/*
|
||||
innobase/autom4te-2.53.cache/output.0
|
||||
@ -432,6 +438,7 @@ libmysqld/log_event.cc
|
||||
libmysqld/md5.c
|
||||
libmysqld/mf_iocache.cc
|
||||
libmysqld/mini_client.cc
|
||||
libmysqld/my_decimal.cc
|
||||
libmysqld/my_time.c
|
||||
libmysqld/net_pkg.cc
|
||||
libmysqld/net_serv.cc
|
||||
@ -985,6 +992,7 @@ support-files/mysql-3.23.29-gamma.spec
|
||||
support-files/mysql-log-rotate
|
||||
support-files/mysql.server
|
||||
support-files/mysql.spec
|
||||
support-files/ndb-config-2-node.ini
|
||||
tags
|
||||
test/ndbapi/bank/bankCreator
|
||||
test/ndbapi/bank/bankMakeGL
|
||||
@ -1052,11 +1060,3 @@ vio/test-ssl
|
||||
vio/test-sslclient
|
||||
vio/test-sslserver
|
||||
vio/viotest-ssl
|
||||
include/mysqld_ername.h
|
||||
include/mysqld_error.h
|
||||
include/sql_state.h
|
||||
support-files/ndb-config-2-node.ini
|
||||
client/decimal.c
|
||||
client/my_decimal.cc
|
||||
client/my_decimal.h
|
||||
libmysqld/my_decimal.cc
|
||||
|
@ -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; }
|
||||
|
Loading…
x
Reference in New Issue
Block a user