database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge bk-internal:/home/bk/mysql-5.0

Browse Source 
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
This commit is contained in:
gkodinov@dl145s.mysql.com
2006-11-27 16:25:52 +01:00
parent 0421d489fb 501333f694
commit e74c9add47
182 changed files with 1156 additions and 1020 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/item_timefunc.cc
View File

@@ -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