From 61c5d97309d6b8510dec8adea6eb4fc69076b072 Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.(none)" <>
Date: Thu, 3 Aug 2006 12:09:22 +0200
Subject: [PATCH] Remove double error printout in mysqldump

---
 client/mysqldump.c            | 2 --
 mysql-test/r/mysqldump.result | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/client/mysqldump.c b/client/mysqldump.c
index 1964e5dee85..3dce7fe8dc8 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -2994,8 +2994,6 @@ static int do_show_master_status(MYSQL *mysql_con)
     (opt_master_data == MYSQL_OPT_MASTER_DATA_COMMENTED_SQL) ? "-- " : "";
   if (mysql_query_with_error_report(mysql_con, &master, "SHOW MASTER STATUS"))
   {
-    my_printf_error(0, "Error: Couldn't execute 'SHOW MASTER STATUS': %s",
-                    MYF(0), mysql_error(mysql_con));
     return 1;
   }
   else
diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
index 51744d6d603..090387d08e9 100644
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/r/mysqldump.result
@@ -2884,7 +2884,7 @@ grant RELOAD on *.* to mysqltest_1@localhost;
 mysqldump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need the SUPER,REPLICATION CLIENT privilege for this operation (1227)
 mysqldump: Couldn't execute 'SHOW MASTER STATUS': Access denied; you need the SUPER,REPLICATION CLIENT privilege for this operation (1227)
 grant REPLICATION CLIENT on *.* to mysqltest_1@localhost;
-CHANGE MASTER TO MASTER_LOG_FILE='master-bin.000003', MASTER_LOG_POS=3784;
+CHANGE MASTER TO MASTER_LOG_FILE='master-bin.000003', MASTER_LOG_POS=9227;
 CREATE TABLE `t1` (
   `a` int(11) default NULL,
   `b` varchar(34) default NULL