Fixed bugs in s3 test cases

mysql-test/suite/s3/alter2.result

@@ -34,7 +34,7 @@ PARTITION BY KEY(pk) PARTITIONS 2;
 CREATE VIEW v1 AS SELECT * FROM t1;
 INSERT INTO t1 VALUES (NULL,'ill'),(NULL,'loop');
 ALTER TABLE t1 ENGINE=S3;
-connect  con1,localhost,root,,test;
+connect  con1,localhost,root,,$database;
 SELECT * FROM t1 WHERE c BETWEEN 'bar' AND 'foo';
 connection default;
 SELECT pk FROM v1;

mysql-test/suite/s3/alter2.test

@@ -43,8 +43,7 @@ CREATE TABLE t1 (
 CREATE VIEW v1 AS SELECT * FROM t1;
 INSERT INTO t1 VALUES (NULL,'ill'),(NULL,'loop');
 ALTER TABLE t1 ENGINE=S3;
-
---connect (con1,localhost,root,,test)
+--connect (con1,localhost,root,,$database)
 --send
     SELECT * FROM t1 WHERE c BETWEEN 'bar' AND 'foo';
 

mysql-test/suite/s3/replication_partition.test

@@ -6,7 +6,7 @@
 --source include/master-slave.inc
 --source create_database.inc
 
-connection slave;
+sync_slave_with_master;
 let $MYSQLD_DATADIR= `select @@datadir`;
 --replace_result $database database
 --eval use $database