Fix portability issues with rpl test suite.

mysql-test/suite/rpl/t/rpl_drop_db.test

@@ -13,8 +13,8 @@ insert into mysqltest1.t1 values (1);
 select * from mysqltest1.t1 into outfile 'mysqltest1/f1.txt';
 create table mysqltest1.t2 (n int);
 create table mysqltest1.t3 (n int);
---replace_result \\ / 66 39 93 39 17 39 247 39 "File exists" "Directory not empty"
---error 1010
+--replace_result \\ / 66 39 93 39 17 39 247 39 41 39 "File exists" "Directory not empty"
+--error ER_DB_DROP_RMDIR
 drop database mysqltest1;
 use mysqltest1;
 show tables;
@@ -30,8 +30,8 @@ while ($1)
 }
 --enable_query_log
 
---replace_result \\ / 66 39 93 39 17 39 247 39 "File exists" "Directory not empty"
---error 1010
+--replace_result \\ / 66 39 93 39 17 39 247 39  41 39 "File exists" "Directory not empty"
+--error ER_DB_DROP_RMDIR
 drop database mysqltest1;
 use mysqltest1;
 show tables;

mysql-test/suite/rpl/t/rpl_mdev382.test

@@ -257,7 +257,7 @@ let $binlog_start= query_get_value(SHOW MASTER STATUS, Position, 1);
 INSERT INTO t1 VALUES(1);
 --source include/show_binlog_events2.inc
 let $pos2= query_get_value(SHOW MASTER STATUS, Position, 1);
---exec $MYSQL_BINLOG --short-form --start-position=$binlog_start --stop-position=$pos2 --rewrite-db='test->ts`et' $MYSQLD_DATADIR/master-bin.000002
+--exec $MYSQL_BINLOG --short-form --start-position=$binlog_start --stop-position=$pos2 "--rewrite-db=test->ts`et" $MYSQLD_DATADIR/master-bin.000002
 DROP TABLE t1;
 
 --source include/rpl_end.inc