diff options
| author | unknown <gkodinov@dl145s.mysql.com> | 2006-11-27 16:25:52 +0100 |
|---|---|---|
| committer | unknown <gkodinov@dl145s.mysql.com> | 2006-11-27 16:25:52 +0100 |
| commit | 880b3d84d110a24ecb1fb7e053334f45d43b7210 (patch) | |
| tree | 08f5946df44304e74078c8398e52f0a45684cd67 /sql/item_timefunc.cc | |
| parent | c0f63d8564fdd1aacd001a882271dd896721d93a (diff) | |
| parent | 52fc261bcab0becc9d23f8d1e511760413a6d85d (diff) | |
| download | mariadb-git-880b3d84d110a24ecb1fb7e053334f45d43b7210.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
libmysql/libmysql.c:
Auto merged
mysql-test/t/subselect.test:
Auto merged
mysql-test/t/type_newdecimal.test:
Auto merged
sql/filesort.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
sql-common/my_time.c:
Auto merged
strings/decimal.c:
Auto merged
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 232ad4b9213..9d9108dd301 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -2487,7 +2487,8 @@ String *Item_char_typecast::val_str(String *str) { // Safe even if const arg char char_type[40]; my_snprintf(char_type, sizeof(char_type), "%s(%lu)", - cast_cs == &my_charset_bin ? "BINARY" : "CHAR", length); + cast_cs == &my_charset_bin ? "BINARY" : "CHAR", + (ulong) length); if (!res->alloced_length()) { // Don't change const str |