summaryrefslogtreecommitdiffstats
path: root/mysql-test/suite/s3
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/suite/s3')
-rw-r--r--mysql-test/suite/s3/alter.result4
-rw-r--r--mysql-test/suite/s3/alter.test6
-rw-r--r--mysql-test/suite/s3/my.cnf3
3 files changed, 11 insertions, 2 deletions
diff --git a/mysql-test/suite/s3/alter.result b/mysql-test/suite/s3/alter.result
index 1a931b71..da8accca 100644
--- a/mysql-test/suite/s3/alter.result
+++ b/mysql-test/suite/s3/alter.result
@@ -130,3 +130,7 @@ count(*) sum(a) sum(b)
select count(*), sum(a), sum(b) from t1;
ERROR 42S02: Table 'database.t1' doesn't exist
drop table t2;
+# MDEV-31781 ALTER TABLE ENGINE=s3 fails
+create table t (a int) engine=Aria;
+alter table t engine=S3, algorithm=copy, lock=none;
+ERROR 0A000: LOCK=NONE is not supported. Reason: S3. Try LOCK=SHARED
diff --git a/mysql-test/suite/s3/alter.test b/mysql-test/suite/s3/alter.test
index 7882d14e..495e6dc2 100644
--- a/mysql-test/suite/s3/alter.test
+++ b/mysql-test/suite/s3/alter.test
@@ -93,6 +93,12 @@ select count(*), sum(a), sum(b) from t2;
select count(*), sum(a), sum(b) from t1;
drop table t2;
+
+--echo # MDEV-31781 ALTER TABLE ENGINE=s3 fails
+create table t (a int) engine=Aria;
+--error ER_ALTER_OPERATION_NOT_SUPPORTED_REASON
+alter table t engine=S3, algorithm=copy, lock=none;
+
#
# clean up
#
diff --git a/mysql-test/suite/s3/my.cnf b/mysql-test/suite/s3/my.cnf
index f851aa18..818b2a88 100644
--- a/mysql-test/suite/s3/my.cnf
+++ b/mysql-test/suite/s3/my.cnf
@@ -1,5 +1,4 @@
-!include include/default_mysqld.cnf
-!include include/default_client.cnf
+!include include/default_my.cnf
[mysqld.1]
plugin-load-add=@ENV.HA_S3_SO