diff --git a/client/mysqldump.c b/client/mysqldump.c
index f4116253f8f..04f2f40068f 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -2621,7 +2621,7 @@ int main(int argc, char **argv)
   compatible_mode_normal_str[0]= 0;
   default_charset= (char *)mysql_universal_client_charset;
 
-  MY_INIT(argv[0]);
+  MY_INIT("mysqldump");
   if (get_options(&argc, &argv))
   {
     my_end(0);
diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
index e465760736f..cb2e8e5528a 100644
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/r/mysqldump.result
@@ -1416,26 +1416,27 @@ create table t2(a varchar(30) primary key, b int not null);
 create table t3(a varchar(30) primary key, b int not null);
 test_sequence
 ------ Testing with illegal table names ------
-MYSQL_DUMP_DIR: Couldn't find table: "\d-2-1.sql"
+mysqldump: Couldn't find table: "\d-2-1.sql"
 
-MYSQL_DUMP_DIR: Couldn't find table: "\t1"
+mysqldump: Couldn't find table: "\t1"
 
-MYSQL_DUMP_DIR: Couldn't find table: "\t1"
+mysqldump: Couldn't find table: "\t1"
 
-MYSQL_DUMP_DIR: Couldn't find table: "\\t1"
+mysqldump: Couldn't find table: "\\t1"
 
-MYSQL_DUMP_DIR: Couldn't find table: "t\1"
+mysqldump: Couldn't find table: "t\1"
 
-MYSQL_DUMP_DIR: Couldn't find table: "t\1"
+mysqldump: Couldn't find table: "t\1"
 
-MYSQL_DUMP_DIR: Couldn't find table: "t/1"
+mysqldump: Couldn't find table: "t/1"
 
 test_sequence
 ------ Testing with illegal database names ------
-MYSQL_DUMP_DIR: Got error: 1049: Unknown database 'mysqldump_test_d' when selecting the database
-MYSQL_DUMP_DIR: Got error: 1102: Incorrect database name 'mysqld\ump_test_db' when selecting the database
+mysqldump: Got error: 1049: Unknown database 'mysqldump_test_d' when selecting the database
+mysqldump: Got error: 1102: Incorrect database name 'mysqld\ump_test_db' when selecting the database
 drop table t1, t2, t3;
 drop database mysqldump_test_db;
+use test;
 create table t1 (a int(10));
 create table t2 (pk int primary key auto_increment,
 a int(10), b varchar(30), c datetime, d blob, e text);
@@ -1453,7 +1454,7 @@ insert into t2 (a, b) values (NULL, NULL),(10, NULL),(NULL, "twenty"),(30, "thir
 	</row>
 	<row>
 		<field name="a">20</field>
- 	</row>
+	</row>
 	</table_data>
 	<table_data name="t2">
 	<row>
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test
index 2ee7fee2802..7f3d3adebbc 100644
--- a/mysql-test/t/mysqldump.test
+++ b/mysql-test/t/mysqldump.test
@@ -573,68 +573,54 @@ create table t3(a varchar(30) primary key, b int not null);
 --disable_query_log
 select '------ Testing with illegal table names ------' as test_sequence ;
 --enable_query_log
---replace_result $MYSQL_DUMP_DIR MYSQL_DUMP_DIR
 --error 6
 --exec $MYSQL_DUMP --compact --skip-comments mysqldump_test_db "\d-2-1.sql" 2>&1
 
---replace_result $MYSQL_DUMP_DIR MYSQL_DUMP_DIR
 --error 6
 --exec $MYSQL_DUMP --compact --skip-comments mysqldump_test_db  "\t1" 2>&1
 
---replace_result $MYSQL_DUMP_DIR MYSQL_DUMP_DIR
 --error 6
 --exec $MYSQL_DUMP --compact --skip-comments mysqldump_test_db  "\\t1" 2>&1
  
---replace_result $MYSQL_DUMP_DIR MYSQL_DUMP_DIR
 --error 6
 --exec $MYSQL_DUMP --compact --skip-comments mysqldump_test_db  "\\\\t1" 2>&1
 
---replace_result $MYSQL_DUMP_DIR MYSQL_DUMP_DIR
 --error 6
 --exec $MYSQL_DUMP --compact --skip-comments mysqldump_test_db  "t\1" 2>&1
 
---replace_result $MYSQL_DUMP_DIR MYSQL_DUMP_DIR
 --error 6
 --exec $MYSQL_DUMP --compact --skip-comments  mysqldump_test_db  "t\\1" 2>&1
 
---replace_result $MYSQL_DUMP_DIR MYSQL_DUMP_DIR
 --error 6
 --exec $MYSQL_DUMP --compact --skip-comments mysqldump_test_db  "t/1" 2>&1
 
---replace_result $MYSQL_DUMP_DIR MYSQL_DUMP_DIR
 --error 6
 --exec $MYSQL_DUMP --compact --skip-comments "mysqldump_test_db" "T_1"
 
---replace_result $MYSQL_DUMP_DIR MYSQL_DUMP_DIR
 --error 6
 --exec $MYSQL_DUMP --compact --skip-comments "mysqldump_test_db" "T%1"
 
---replace_result $MYSQL_DUMP_DIR MYSQL_DUMP_DIR
 --error 6
 --exec $MYSQL_DUMP --compact --skip-comments "mysqldump_test_db" "T'1"
 
---replace_result $MYSQL_DUMP_DIR MYSQL_DUMP_DIR
 --error 6
 --exec $MYSQL_DUMP --compact --skip-comments "mysqldump_test_db" "T_1"
 
---replace_result $MYSQL_DUMP_DIR MYSQL_DUMP_DIR
 --error 6
 --exec $MYSQL_DUMP --compact --skip-comments "mysqldump_test_db" "T_"
 
 --disable_query_log
 select '------ Testing with illegal database names ------' as test_sequence ;
 --enable_query_log
---replace_result $MYSQL_DUMP_DIR MYSQL_DUMP_DIR
 --error 2
 --exec $MYSQL_DUMP --compact --skip-comments mysqldump_test_d 2>&1
 
---replace_result $MYSQL_DUMP_DIR MYSQL_DUMP_DIR
 --error 2
 --exec $MYSQL_DUMP --compact --skip-comments "mysqld\ump_test_db" 2>&1
 
 drop table t1, t2, t3;
 drop database mysqldump_test_db;
-
+use test;
 
 
 #