1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-21824

Browse Source 
restore check for client charset_info == NULL, which was previously
removed in MDEV-8844
This commit is contained in:
Vladislav Vaintroub 2020-03-16 11:43:30 +01:00
parent 92d61c2229
commit 56402e84b5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_error.cc
View File

@ -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,