Added ErrConvString.lex_cstring() to simplify code

This allows us to use String::append() without using strlen().

The changes to the ErrConvString class where done by Alexander Barkov

1 files changed, 4 insertions, 4 deletions

diff --git a/sql/sql_error.cc b/sql/sql_error.cc
index 9af57ea6c01..bb47502b3ce 100644
--- a/sql/sql_error.cc
+++ b/sql/sql_error.cc
@@ -864,11 +864,11 @@ extern "C" int my_wc_mb_utf8_null_terminated(CHARSET_INFO *cs,
    @param from_cs     charset from convert
  
    @retval
-   result string
+   result string length
 */
 
-char *err_conv(char *buff, uint to_length, const char *from,
-               uint from_length, CHARSET_INFO *from_cs)
+size_t err_conv(char *buff, uint to_length, const char *from,
+                uint from_length, CHARSET_INFO *from_cs)
 {
   char *to= buff;
   const char *from_start= from;
@@ -919,7 +919,7 @@ char *err_conv(char *buff, uint to_length, const char *from,
                                &errors);
     to[res]= 0;
   }
-  return buff;
+  return res;
 }