diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 79fee8d493a..be5e997bf3d 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -392,6 +392,7 @@ start_slave()
       master_info="--master-user=root \
 	    --master-connect-retry=1 \
 	    --master-host=127.0.0.1 \
+	    --master-password= \
 	    --master-port=$MASTER_MYPORT \
 	    --server-id=2"
    else
diff --git a/mysql-test/t/rpl000017-slave.sh b/mysql-test/t/rpl000017-slave.sh
index fe875f1a778..4415f093aad 100755
--- a/mysql-test/t/rpl000017-slave.sh
+++ b/mysql-test/t/rpl000017-slave.sh
@@ -2,8 +2,8 @@ cat > $MYSQL_TEST_DIR/var/slave-data/master.info <<EOF
 master-bin.001
 4
 127.0.0.1
-root
-
+replicate
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 9306
 1
 EOF
diff --git a/mysql-test/t/rpl000017.test b/mysql-test/t/rpl000017.test
index c93d861bec8..d695561b671 100644
--- a/mysql-test/t/rpl000017.test
+++ b/mysql-test/t/rpl000017.test
@@ -2,6 +2,8 @@ connect (master,localhost,root,,test,0,mysql-master.sock);
 connect (slave,localhost,root,,test,0,mysql-slave.sock);
 connection master;
 reset master;
+grant file on *.* to replicate@localhost identified by
+ 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa';
 connection slave;
 slave start;
 connection master;
diff --git a/sql/table.cc b/sql/table.cc
index 8ee6ee02d68..b6fde659cd9 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -1033,7 +1033,7 @@ char *get_field(MEM_ROOT *mem, TABLE *table, uint fieldnr)
 
 bool check_db_name(const char *name)
 {
-  const char *start=end;
+  const char *start=name;
   while (*name)
   {
 #if defined(USE_MB) && defined(USE_MB_IDENT)