diff options
author | Monty <monty@mariadb.org> | 2020-06-18 11:44:28 +0300 |
---|---|---|
committer | Monty <monty@mariadb.org> | 2020-06-19 12:03:13 +0300 |
commit | 6a0c05b7610dfa8ac414911171a3ee11fe0068b8 (patch) | |
tree | 31a61aeacaab50efde5fa5ed79775aae72fdd7f9 | |
parent | 00bd52b14722737b3e8d22dc8c3fcbeeab8efeef (diff) | |
download | mariadb-git-6a0c05b7610dfa8ac414911171a3ee11fe0068b8.tar.gz |
Fixed bugs in s3 test cases
-rw-r--r-- | mysql-test/suite/s3/alter2.result | 2 | ||||
-rw-r--r-- | mysql-test/suite/s3/alter2.test | 3 | ||||
-rw-r--r-- | mysql-test/suite/s3/replication_partition.test | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/mysql-test/suite/s3/alter2.result b/mysql-test/suite/s3/alter2.result index b15d2b1eb96..8d2cae035c9 100644 --- a/mysql-test/suite/s3/alter2.result +++ b/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; diff --git a/mysql-test/suite/s3/alter2.test b/mysql-test/suite/s3/alter2.test index 0be82f5a7ff..856b141573b 100644 --- a/mysql-test/suite/s3/alter2.test +++ b/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'; diff --git a/mysql-test/suite/s3/replication_partition.test b/mysql-test/suite/s3/replication_partition.test index 8751ab33730..0430d14d7a7 100644 --- a/mysql-test/suite/s3/replication_partition.test +++ b/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 |