fixed test after merge

mysql-test/r/rpl_delete_all.result

@@ -9,7 +9,7 @@ drop database if exists mysqltest;
 Warnings:
 Note	1008	Can't drop database 'mysqltest'; database doesn't exist
 show tables from mysqltest;
-ERROR HY000: Can't read dir of './mysqltest/' (Errcode: X)
+ERROR 42000: Unknown database 'mysqltest'
 create table t1 (a int);
 drop table if exists t1;
 Warnings:

mysql-test/t/rpl_delete_all.test

@@ -7,7 +7,7 @@ drop database if exists mysqltest;
 sync_slave_with_master;
 # can't read dir
 --replace_result "Errcode: 1" "Errcode: X" "Errcode: 2" "Errcode: X" \\ /
---error 12
+--error 1049
 show tables from mysqltest;
 
 connection slave;