Commit 56402e84 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

MDEV-21824

restore check for client charset_info == NULL, which was previously
removed in MDEV-8844
parent 92d61c22
...@@ -947,7 +947,7 @@ size_t convert_error_message(char *to, size_t to_length, CHARSET_INFO *to_cs, ...@@ -947,7 +947,7 @@ size_t convert_error_message(char *to, size_t to_length, CHARSET_INFO *to_cs,
/* Make room for the null terminator. */ /* Make room for the null terminator. */
to_length--; to_length--;
if (to_cs == &my_charset_bin) if (!to_cs || to_cs == &my_charset_bin)
to_cs= system_charset_info; to_cs= system_charset_info;
uint32 cnv_length= my_convert_using_func(to, to_length, uint32 cnv_length= my_convert_using_func(to, to_length,
to_cs, to_cs,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment