summaryrefslogtreecommitdiff
path: root/sql/strfunc.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/strfunc.cc')
-rw-r--r--sql/strfunc.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/strfunc.cc b/sql/strfunc.cc
index 4eb20faa97c..2525703172f 100644
--- a/sql/strfunc.cc
+++ b/sql/strfunc.cc
@@ -258,7 +258,7 @@ uint check_word(TYPELIB *lib, const char *val, const char *end,
uint strconvert(CHARSET_INFO *from_cs, const char *from,
- CHARSET_INFO *to_cs, char *to, uint to_length)
+ CHARSET_INFO *to_cs, char *to, uint to_length, uint *errors)
{
int cnvres;
my_wc_t wc;
@@ -308,6 +308,7 @@ outp:
break;
}
*to= '\0';
+ *errors= error_count;
return (uint32) (to - to_start);
}