diff options
author | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-09-23 16:47:08 +0300 |
---|---|---|
committer | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-09-23 16:47:08 +0300 |
commit | 832638929320aa3ebd5b2fefe75eba6f2413f1b6 (patch) | |
tree | dabaf9b38c2c72433e000b36b0a628d9d36fbb38 /sql/sql_parse.cc | |
parent | dba6991085bfeef3e0d9388ef65369fde38cbb7a (diff) | |
download | mariadb-git-832638929320aa3ebd5b2fefe75eba6f2413f1b6.tar.gz |
Several fixes revelaled by Intel compiler.
cmd-line-utils/readline/complete.c:
Added a cast.
dbug/my_main.c:
Added an include to avoid implicit declaration of
my_thread_global_init()
include/my_global.h:
undef cannot be used on this predefined name.
Since it is a custom fix for gcc 2.8.0, let's make it only
effective in that case.
include/my_sys.h:
Added a new type, TYPE_NOT_SET.
myisam/ft_boolean_search.c:
Added casts.
myisam/mi_key.c:
Added cast.
myisam/mi_open.c:
Added cast.
Changed function types.
myisam/mi_test1.c:
Added cast.
myisam/myisamchk.c:
Added cast.
myisam/myisamdef.h:
Changed function type.
myisam/myisampack.c:
Added casts.
myisam/sp_key.c:
Added cast.
mysys/mf_iocache.c:
Fixed invalid use of 0 to info->type. According to comment it
should not have been set, but in earlier code by setting it
to 0 would have been same as setting it to READ_CACHE. This
probably was not desired, potential bug.
server-tools/instance-manager/instance_options.cc:
Fixed a typo.
server-tools/instance-manager/protocol.cc:
Changed enum to int.
Changed char to uchar.
Added casts.
sql/mysql_priv.h:
Bit overflow.
sql/sql_base.cc:
Removed unused label. The code below label was unused too, because
there is a return just before.
sql/sql_parse.cc:
Removed unneccessary extra argument.
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r-- | sql/sql_parse.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index ff3d56266f6..b5c251df89e 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -5644,8 +5644,7 @@ bool add_field_to_list(THD *thd, char *field_name, enum_field_types type, and so on, the display width is ignored. */ char buf[32]; - my_snprintf(buf, sizeof(buf), - "TIMESTAMP(%s)", length, system_charset_info); + my_snprintf(buf, sizeof(buf), "TIMESTAMP(%s)", length); push_warning_printf(thd,MYSQL_ERROR::WARN_LEVEL_WARN, ER_WARN_DEPRECATED_SYNTAX, ER(ER_WARN_DEPRECATED_SYNTAX), |