diff options
author | bar@bar.mysql.r18.ru <> | 2002-11-06 17:43:22 +0400 |
---|---|---|
committer | bar@bar.mysql.r18.ru <> | 2002-11-06 17:43:22 +0400 |
commit | 2434be61f8bdf32af2f42f8aa0d758e27b1fc98b (patch) | |
tree | da00e60b2fd7b0ab3f00cdd758ad27aac80f49ce /sql/item_timefunc.cc | |
parent | 86b633379cdee7707b5dd69a3658e7ba1afa0946 (diff) | |
download | mariadb-git-2434be61f8bdf32af2f42f8aa0d758e27b1fc98b.tar.gz |
String->copy() now has a charset arg
Diffstat (limited to 'sql/item_timefunc.cc')
-rw-r--r-- | sql/item_timefunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index e81fecabe96..8a1bd0be291 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -396,7 +396,7 @@ String *Item_date::val_str(String *str) return (String*) 0; if (!value) // zero daynr { - str->copy("0000-00-00",10); + str->copy("0000-00-00",10,my_charset_latin1); return str; } if (str->alloc(11)) @@ -547,7 +547,7 @@ String *Item_func_sec_to_time::val_str(String *str) uint sec= (uint) ((ulonglong) seconds % 3600); length= my_sprintf(buff,(buff,"%s%02lu:%02u:%02u",sign,(long) (seconds/3600), sec/60, sec % 60)); - str->copy(buff, length); + str->copy(buff, length, my_charset_latin1); return str; } |