diff options
Diffstat (limited to 'sql/sql_error.cc')
| -rw-r--r-- | sql/sql_error.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_error.cc b/sql/sql_error.cc index 4045f30a6bd..e5dda9904d2 100644 --- 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, |