summaryrefslogtreecommitdiff
path: root/client/mysqldump.c
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2012-08-13 23:45:16 +0300
committerMichael Widenius <monty@askmonty.org>2012-08-13 23:45:16 +0300
commitc0f04fa31cd46c2507b2152eeeeb4950e0d5edc9 (patch)
treeb0696b0df90fdc17d6801d14229c74167f00647d /client/mysqldump.c
parentc9b95de246ccaad22abf90996f295b05fe85f53d (diff)
parentcee888acb36141136cdb121a7bb7d53200b14cb6 (diff)
downloadmariadb-git-c0f04fa31cd46c2507b2152eeeeb4950e0d5edc9.tar.gz
Automatic merge
Diffstat (limited to 'client/mysqldump.c')
-rw-r--r--client/mysqldump.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c
index 739cc345ec2..c20d4947185 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -4805,7 +4805,7 @@ static int add_slave_statements(void)
static int do_show_slave_status(MYSQL *mysql_con)
{
- MYSQL_RES *slave;
+ MYSQL_RES *slave= 0;
const char *comment_prefix=
(opt_slave_data == MYSQL_OPT_SLAVE_DATA_COMMENTED_SQL) ? "-- " : "";
if (mysql_query_with_error_report(mysql_con, &slave, "SHOW SLAVE STATUS"))