A fix according to Monty's request:

"uint *errors" is now a non-optional parameter in String:copy()
and copy_and_convert().

1 files changed, 3 insertions, 1 deletions

diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc
index 3c8dbb013a9..f621953a5bc 100644
--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -2121,8 +2121,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;