Merge lp:~icgood/maria/maria-fix-bug4319 into lp:maria

[Ian Good]

This change fixes JIRA bug MDEV-4319 (https://mariadb.atlassian.net/browse/MDEV-4319), a bug that I also submitted.

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. See the linked bug report for very specific reproducible incidents.

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. Four additional lines of code and one additional line of comments were added by this fix.

[lp:~icgood/maria/maria-fix-bug4319]

3505. By Ian Good on 2013-03-23

fixed ordering of ifs

[Ian Good (icgood)]

This patch and all fixes to it are provided to the MariaDB Foundation under the MCA (https://kb.askmonty.org/en/mca/).

[Michael Widenius (monty)]

Hi!

>>>>> "Ian" == Ian Good <email address hidden> writes:

Ian> This patch and all fixes to it are provided to the MariaDB Foundation under the MCA (https://kb.askmonty.org/en/mca/).

Great, thanks!

Regards,
Monty

[Michael Widenius (monty)]

I have now merged and pushed this into 5.5

Note that the patch only affects comment and not how replication is executed.

I also changed the hex number to characters to make the code easier to read.

review: Approve

[Michael Widenius (monty)]

Hi!

>>>>> "Ian" == Ian Good <email address hidden> writes:

Ian> Ian Good has proposed merging lp:~icgood/maria/maria-fix-bug4319 into lp:maria.
Ian> Requested reviews:
Ian> Maria-captains (maria-captains)

Ian> For more details, see:
Ian> https://code.launchpad.net/~icgood/maria/maria-fix-bug4319/+merge/155115

Ian> This change fixes JIRA bug MDEV-4319 (https://mariadb.atlassian.net/browse/MDEV-4319), a bug that I also submitted.

Ian> 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. See the linked bug report for very specific reproducible incidents.

Ian> 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. Four additional lines of code and one additional line of comments were added by this fix.
Ian> --
Ian> https://code.launchpad.net/~icgood/maria/maria-fix-bug4319/+merge/155115
Ian> Your team Maria-captains is requested to review the proposed merge of lp:~icgood/maria/maria-fix-bug4319 into lp:maria.

I have now merged and pushed this into 5.5

Thanks for the bug fix!

Regards,
Monty

=== modified file 'sql/log_event.cc'
--- sql/log_event.cc	2013-01-31 08:48:19 +0000
+++ sql/log_event.cc	2013-03-23 21:10:29 +0000
@@ -1808,6 +1808,7 @@
 /**
   Prints a quoted string to io cache.
   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] prt               Pointer to string
@@ -1821,7 +1822,11 @@
   my_b_printf(file, "'");
   for (s= ptr; length > 0 ; s++, length--)
   {
-    if (*s > 0x1F)
+    if (*s == 0x27)
+      my_b_write(file, "\\'", 2);
+    else if (*s == 0x5C)
+      my_b_write(file, "\\\\", 2);
+    else if (*s > 0x1F)
       my_b_write(file, s, 1);
     else
     {