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

Patch by Ian Good for MDEV-4319: mysqlbinlog output ambiguous escaping

Browse Source 
The output of mysqlbinlog (with "-v --base64-output=DECODE-ROWS" flags) can not always be read or parsed correctly
when string columns contain single-quotes or backslash characters.

The fix for this bug is to escape single-quote and backslash characters on output, so that the result is both more
readable and more easily parse-able.

Note that this is just for comments, so it doesn't affect the replication.

sql/log_event.cc:
  Escape \ and ' properly for mysqlbin user comments.
This commit is contained in:
Michael Widenius 2013-03-25 16:45:24 +02:00
parent 495fd27c0e
commit c579bce349
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sql/log_event.cc
View File

@ -1804,6 +1804,7 @@ void Log_event::print_header(IO_CACHE* file,
/** /**
Prints a quoted string to io cache. Prints a quoted string to io cache.
Control characters are displayed as hex sequence, e.g. \x00 Control characters are displayed as hex sequence, e.g. \x00
Single-quote and backslash characters are escaped with a \
@param[in] file IO cache @param[in] file IO cache
@param[in] prt Pointer to string @param[in] prt Pointer to string
@ -1819,6 +1820,10 @@ my_b_write_quoted(IO_CACHE *file, const uchar *ptr, uint length)
{ {
if (*s > 0x1F) if (*s > 0x1F)
my_b_write(file, s, 1); my_b_write(file, s, 1);
else if (*s == '\'')
my_b_write(file, "\\'", 2);
else if (*s == '\\')
my_b_write(file, "\\\\", 2);
else else
{ {
uchar hex[10]; uchar hex[10];