database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-8844 Unreadable control characters printed as is in warnings

Browse Source
This commit is contained in:
Alexander Barkov
2019-12-06 18:51:05 +04:00
parent 00445652db
commit 3c6065a270
28 changed files with 517 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sql/sql_string.cc
View File

@ -777,6 +777,28 @@ void Static_binary_string::qs_append(ulonglong i)
str_length+= (int) (end-buff);
}
bool Binary_string::copy_printable_hhhh(CHARSET_INFO *to_cs,
CHARSET_INFO *from_cs,
const char *from,
uint32 from_length)
{
uint errors;
uint one_escaped_char_length= MY_CS_PRINTABLE_CHAR_LENGTH * to_cs->mbminlen;
uint one_char_length= MY_MAX(one_escaped_char_length, to_cs->mbmaxlen);
uint32 bytes_needed= (uint32) from_length * one_char_length;
if (alloc(bytes_needed))
return true;
str_length= my_convert_using_func(Ptr, Alloced_length, to_cs,
my_wc_to_printable_generic,
from, from_length,
from_cs,
from_cs->cset->mb_wc,
&errors);
return false;
}
/*
Compare strings according to collation, without end space.