1 files changed, 9 insertions, 11 deletions
diff --git a/mysql-test/r/rpl000001.result b/mysql-test/r/rpl000001.result
index 60a5db1de3a..2dc21e86152 100644
--- a/mysql-test/r/rpl000001.result
+++ b/mysql-test/r/rpl000001.result
@@ -1,10 +1,10 @@
 slave stop;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 slave start;
-use test;
-drop table if exists t1,t3;
+drop table if exists t1,t2,t3;
 create table t1 (word char(20) not null);
 load data infile '../../std_data/words.dat' into table t1;
 load data local infile 'MYSQL_TEST_DIR/std_data/words.dat' into table t1;
@@ -30,11 +30,12 @@ abandoned
 abandoning
 abandonment
 abandons
+slave stop;
 set password for root@"localhost" = password('foo');
+slave start;
 set password for root@"localhost" = password('');
 create table t3(n int);
 insert into t3 values(1),(2);
-use test;
 select * from t3;
 n
 1
@@ -46,7 +47,6 @@ drop table t1,t3;
 reset master;
 slave stop;
 reset slave;
-drop table if exists t1,t2;
 create table t1(n int);
 select get_lock("hold_slave",10);
 get_lock("hold_slave",10)
@@ -58,8 +58,8 @@ release_lock("hold_slave")
 unlock tables;
 create table t2(id int);
 insert into t2 values(connection_id());
-create temporary table t1_temp(n int);
-insert into t1_temp select get_lock('crash_lock%20C', 1) from t2;
+create temporary table t3(n int);
+insert into t3 select get_lock('crash_lock%20C', 1) from t2;
  update t1 set n = n + get_lock('crash_lock%20C', 2);
 select (@id := id) - id from t2;
 (@id := id) - id
@@ -67,7 +67,7 @@ select (@id := id) - id from t2;
 kill @id;
 drop table t2;
 Server shutdown in progress
-set sql_slave_skip_counter=1;
+set global sql_slave_skip_counter=1;
 slave start;
 select count(*) from t1;
 count(*)
@@ -75,17 +75,15 @@ count(*)
 drop table t1;
 create table t1 (n int);
 insert into t1 values(3456);
-use mysql;
-insert into user (Host, User, Password)
+insert into mysql.user (Host, User, Password)
 VALUES ("10.10.10.%", "blafasel2", password("blafasel2"));
 select select_priv,user from mysql.user where user = 'blafasel2';
 select_priv	user
 N	blafasel2
-update user set Select_priv = "Y" where User="blafasel2";
+update mysql.user set Select_priv = "Y" where User="blafasel2";
 select select_priv,user from mysql.user where user = 'blafasel2';
 select_priv	user
 Y	blafasel2
-use test;
 select n from t1;
 n
 3456