diff options
| author | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-09-30 12:36:23 +0300 |
|---|---|---|
| committer | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-09-30 12:36:23 +0300 |
| commit | c8e0432dbdf5a41677f2c64b5a596badddf717b2 (patch) | |
| tree | 46e4f0b440e6f71cce0bd6d08e417177132ed980 /sql/sql_parse.cc | |
| parent | 1e148ca472db5a181840dc909fa8b04eac5790f8 (diff) | |
| parent | fea5dcaea1caada7fbd8dbd900336a960299a274 (diff) | |
| download | mariadb-git-c8e0432dbdf5a41677f2c64b5a596badddf717b2.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
client/mysqltest.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisamdef.h:
Auto merged
sql/item.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
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 46740460526..81fc941e809 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), |