------------------------------------------------------------
revno: 259
fixes bug: https://launchpad.net/bugs/1013432
committer: Stewart Smith <stewart@flamingspork.com>
branch nick: bug1013432-mysqldump-malformed-change-master
timestamp: Fri 2012-06-15 14:59:16 +1000
message:
  fix mysqldump --include-master-host-port  to output a CHANGE MASTER command that will actually work.
modified:
  Percona-Server/client/mysqldump.c
  Percona-Server/mysql-test/r/rpl_mysqldump_slave.result
diff:
=== modified file 'Percona-Server/client/mysqldump.c'
--- Percona-Server/client/mysqldump.c	2012-06-05 10:36:15 +0000
+++ Percona-Server/client/mysqldump.c	2012-06-15 04:59:16 +0000
@@ -4995,7 +4995,7 @@
         if (row[1])
           fprintf(md_result_file, "MASTER_HOST='%s', ", row[1]);
         if (row[3])
-          fprintf(md_result_file, "MASTER_PORT='%s', ", row[3]);
+          fprintf(md_result_file, "MASTER_PORT=%s, ", row[3]);
       }
       fprintf(md_result_file,
               "MASTER_LOG_FILE='%s', MASTER_LOG_POS=%s;\n", row[9], row[21]);

=== modified file 'Percona-Server/mysql-test/r/rpl_mysqldump_slave.result'
--- Percona-Server/mysql-test/r/rpl_mysqldump_slave.result	2010-12-19 17:15:12 +0000
+++ Percona-Server/mysql-test/r/rpl_mysqldump_slave.result	2012-06-15 04:59:16 +0000
@@ -9,6 +9,6 @@
 CHANGE MASTER TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START;
 START SLAVE;
 STOP SLAVE;
-CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT='MASTER_MYPORT', MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START;
+CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_MYPORT, MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START;
 START SLAVE;
 include/rpl_end.inc