Comment 6 for bug 1228333

Revision history for this message
Raghavendra D Prabhu (raghavendra-prabhu) wrote :

Fixed as:

bzr log -r437 -p
------------------------------------------------------------
revno: 437
fixes bug: https://launchpad.net/bugs/1228333
committer: Raghavendra D Prabhu <email address hidden>
branch nick: pxc-5.6-test
timestamp: Mon 2013-09-23 23:02:36 +0530
message:
  Bug#1228333: Fix the binlog issue during rsync SST
diff:
=== modified file 'Percona-Server/sql/wsrep_sst.cc'
--- Percona-Server/sql/wsrep_sst.cc 2013-09-20 21:34:32 +0000
+++ Percona-Server/sql/wsrep_sst.cc 2013-09-23 17:32:36 +0000
@@ -402,8 +402,8 @@
   ssize_t cmd_len= 1024;
   char cmd_str[cmd_len];
   const char* sst_dir= mysql_real_data_home;
- const char* binlog_opt= (opt_bin_logname ? WSREP_SST_OPT_BINLOG : "");
- const char* binlog_opt_val= (opt_bin_logname ? opt_bin_logname : "");
+ const char* binlog_opt= (strcmp(opt_bin_logname, "0") ? WSREP_SST_OPT_BINLOG : "");
+ const char* binlog_opt_val= (strcmp(opt_bin_logname, "0") ? opt_bin_logname : "");

   int ret= snprintf (cmd_str, cmd_len,
                      "wsrep_sst_%s "
@@ -929,8 +929,8 @@
 {
   ssize_t cmd_len = 4096;
   char cmd_str[cmd_len];
- const char* binlog_opt= (opt_bin_logname ? WSREP_SST_OPT_BINLOG : "");
- const char* binlog_opt_val= (opt_bin_logname ? opt_bin_logname : "");
+ const char* binlog_opt= (strcmp(opt_bin_logname, "0") ? WSREP_SST_OPT_BINLOG : "");
+ const char* binlog_opt_val= (strcmp(opt_bin_logname, "0") ? opt_bin_logname : "");

   int ret= snprintf (cmd_str, cmd_len,
                      "wsrep_sst_%s "

and tested with rsync SST + sysbench.