diff options
| author | monty@mysql.com <> | 2004-11-04 15:06:24 +0200 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-11-04 15:06:24 +0200 |
| commit | 071001950efe9886a56ec8a365217f0d1cd92c1f (patch) | |
| tree | 9d4d27a72c18ead47fb83bd5ec0e2383cdd34ff6 /sql/item_timefunc.cc | |
| parent | a1a27eb35a8ad7616cb08937dc4e959e2410c35b (diff) | |
| parent | f5e5dfb2f779cbb5468d63d94d659fa3d6a17e8a (diff) | |
| download | mariadb-git-071001950efe9886a56ec8a365217f0d1cd92c1f.tar.gz | |
Merge with 4.1 to get in latest bug fixes
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 3a25921d84b..fd7a2ea2cb4 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -2140,8 +2140,10 @@ String *Item_char_typecast::val_str(String *str) else { // Convert character set if differ + uint dummy_errors; if (!(res1= args[0]->val_str(&tmp_value)) || - str->copy(res1->ptr(), res1->length(),res1->charset(), cast_cs)) + str->copy(res1->ptr(), res1->length(), res1->charset(), + cast_cs, &dummy_errors)) { null_value= 1; return 0; |