From b3bc02f923f6002e6a5bd6446b80575292e1b0c7 Mon Sep 17 00:00:00 2001 From: Monty Date: Fri, 14 Aug 2020 20:22:43 +0300 Subject: 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 --- storage/connect/ha_connect.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'storage') diff --git a/storage/connect/ha_connect.cc b/storage/connect/ha_connect.cc index 9e1d7502dcf..1474af92933 100644 --- a/storage/connect/ha_connect.cc +++ b/storage/connect/ha_connect.cc @@ -3480,11 +3480,11 @@ bool ha_connect::get_error_message(int error, String* buf) if (trace(1)) htrc("GEM(%d): %s\n", error, g->Message); - - buf->append(ErrConvString(g->Message, strlen(g->Message), - &my_charset_latin1).ptr()); + buf->append(ErrConvString(g->Message, + strlen(g->Message), + &my_charset_latin1).lex_cstring()); } else - buf->append("Cannot retrieve error message"); + buf->append(STRING_WITH_LEN("Cannot retrieve error message")); DBUG_RETURN(false); } // end of get_error_message -- cgit v1.2.1