A few miscellaneous changes, including a fix for metadata locking and wipe_clean in Sandbox.pm

t/lib/MasterSlave.t

@@ -337,7 +337,7 @@ ok($res->{result} >= 0, 'Wait was successful');
 
 $ms->stop_slave($slaves[0]);
 $dbh->do('drop database if exists test'); # Any stmt will do
-diag(`(sleep 1; echo "start slave" | /tmp/$port_for{slave0}/use)&`);
+diag(`(sleep 3; echo "start slave" | /tmp/$port_for{slave0}/use)&`);
 eval {
    $res = $ms->wait_for_master(
       master_status => $ms->get_master_status($dbh),

t/pt-table-sync/samples/issue_22.sql

@@ -11,4 +11,4 @@ CREATE TABLE `messages` (
   PRIMARY KEY (`MID`),
   UNIQUE KEY `ID` (`MID`),
   KEY `TID` (`TID`)
-) TYPE=MyISAM;
+) ENGINE=MyISAM;