Commit 234bb881 authored by unknown's avatar unknown

Remove double error printout in mysqldump


client/mysqldump.c:
  Remove double error printout, mysql_query_with_error_report will do that. And set the exit code for us.
mysql-test/r/mysqldump.result:
  Update test result after merge
parent 607b8e5e
...@@ -2994,8 +2994,6 @@ static int do_show_master_status(MYSQL *mysql_con) ...@@ -2994,8 +2994,6 @@ static int do_show_master_status(MYSQL *mysql_con)
(opt_master_data == MYSQL_OPT_MASTER_DATA_COMMENTED_SQL) ? "-- " : ""; (opt_master_data == MYSQL_OPT_MASTER_DATA_COMMENTED_SQL) ? "-- " : "";
if (mysql_query_with_error_report(mysql_con, &master, "SHOW MASTER STATUS")) 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; return 1;
} }
else else
......
...@@ -2884,7 +2884,7 @@ grant RELOAD on *.* to mysqltest_1@localhost; ...@@ -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)
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; 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` ( CREATE TABLE `t1` (
`a` int(11) default NULL, `a` int(11) default NULL,
`b` varchar(34) default NULL `b` varchar(34) default NULL
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment