Merge lp:~tsarev/percona-server/18205_01_mysqlbinlog_fix.patch into lp:percona-server/rnt-5.1

[Oleg Tsarev]

fix code policy in mysqlbinlog_fix.patch

(issue 18205 - prepare lp:percona-server/rnt-5.1 patches to merge to lp:percona-server/5.1)

after merge this fix to lp:percona-server/rnt-5.1 I will propose for merge it to lp:percona-server/5.1

[Laurynas Biveinis (laurynas-biveinis)]

Is the

32 + if (mysql)
33 ++ {
34 + mysql_close(mysql);
35 ++ }

change necessary?

The coding standards say

"After if or else or while, when there is only one instruction after the condition, braces are not necessary and the instruction goes on the next line, indented. "

review: Needs Information

[Laurynas Biveinis (laurynas-biveinis)]

And they also say

"if, while, etc *must* always have braces. "

So, a self-contradiction. The change looks good to me, then.

review: Approve

[Alexey Kopytov (akopytov)]

The "must" part is from the NDB guidelines. So those changes are not necessary in the server.

[Laurynas Biveinis (laurynas-biveinis)]

Thanks Alexey.

review: Needs Fixing

[Laurynas Biveinis (laurynas-biveinis)]

LGTM, thank you.

review: Approve

=== modified file 'patches/mysqlbinlog_fix.patch'
--- patches/mysqlbinlog_fix.patch	2011-11-17 12:41:18 +0000
+++ patches/mysqlbinlog_fix.patch	2012-01-31 07:53:24 +0000
@@ -7,7 +7,7 @@
 # should be done or reviewed by the maintainer!
 --- a/client/mysqlbinlog.cc
 +++ b/client/mysqlbinlog.cc
-@@ -741,9 +741,17 @@
+@@ -741,9 +741,19 @@
  
      switch (ev_type) {
      case QUERY_EVENT:
@@ -21,14 +21,16 @@
 +      }
 +      else
 +      {
-+        // In case the event for one of these statements is obtained
-+        // from binary log 5.0, make it compatible with 5.1
++        /*
++          In case the event for one of these statements is obtained
++          from binary log 5.0, make it compatible with 5.1.
++        */
 +        ev->flags|= LOG_EVENT_SUPPRESS_USE_F;
 +      }
        if (opt_base64_output_mode == BASE64_OUTPUT_ALWAYS)
        {
          if ((retval= write_event_header_and_base64(ev, result_file,
-@@ -1391,6 +1399,10 @@
+@@ -1391,6 +1401,10 @@
  */
  static Exit_status safe_connect()
  {