MDEV-21824

restore check for client charset_info == NULL, which was previously removed in MDEV-8844

MDEV-21824
restore check for client charset_info == NULL, which was previously removed in MDEV-8844
56402e84 · Vladislav Vaintroub · 92d61c22 · 56402e84
Commit 56402e84 authored Mar 16, 2020 by Vladislav Vaintroub
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/sql_error.cc sql/sql_error.cc +1 -1

No files found.
--- a/sql/sql_error.cc
+++ b/sql/sql_error.cc
@@ -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. */
  to_length--;

-  if (to_cs == &my_charset_bin)
+  if (!to_cs || to_cs == &my_charset_bin)
    to_cs= system_charset_info;
  uint32 cnv_length= my_convert_using_func(to, to_length,
                                           to_cs,