From 103643d87ae995f2f3649e1c0a9867c4b7343bf5 Mon Sep 17 00:00:00 2001 From: Michael Widenius Date: Wed, 12 Feb 2014 00:06:44 +0200 Subject: [PATCH] Changed " to ' around connection name (safer) --- client/mysqldump.c | 6 +++--- mysql-test/r/rpl_mysqldump_slave.result | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client/mysqldump.c b/client/mysqldump.c index 151cbb66141..151a66302b2 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -4805,7 +4805,7 @@ static int do_stop_slave_sql(MYSQL *mysql_con) { char query[160]; if (multi_source) - sprintf(query, "STOP SLAVE \"%.80s\" SQL_THREAD", row[0]); + sprintf(query, "STOP SLAVE '%.80s' SQL_THREAD", row[0]); else strmov(query, "STOP SLAVE SQL_THREAD"); @@ -4877,7 +4877,7 @@ static int do_show_slave_status(MYSQL *mysql_con) "recovery from (the master of this slave)\n--\n\n"); if (multi_source) - fprintf(md_result_file, "%sCHANGE MASTER \"%.80s\" TO ", + fprintf(md_result_file, "%sCHANGE MASTER '%.80s' TO ", comment_prefix, row[0]); else fprintf(md_result_file, "%sCHANGE MASTER TO ", comment_prefix); @@ -4925,7 +4925,7 @@ static int do_start_slave_sql(MYSQL *mysql_con) { char query[160]; if (multi_source) - sprintf(query, "START SLAVE \"%.80s\"", row[0]); + sprintf(query, "START SLAVE '%.80s'", row[0]); else strmov(query, "START SLAVE"); diff --git a/mysql-test/r/rpl_mysqldump_slave.result b/mysql-test/r/rpl_mysqldump_slave.result index 655a99b918f..e7ea0a308a9 100644 --- a/mysql-test/r/rpl_mysqldump_slave.result +++ b/mysql-test/r/rpl_mysqldump_slave.result @@ -4,11 +4,11 @@ include/master-slave.inc # New --dump-slave, --apply-slave-statements functionality # use test; -CHANGE MASTER "" TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START; +CHANGE MASTER '' TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START; STOP ALL SLAVES; -CHANGE MASTER "" TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START; +CHANGE MASTER '' TO MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=BINLOG_START; START ALL SLAVES; STOP ALL SLAVES; -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 ALL SLAVES; include/rpl_end.inc