diff --git a/mysql-test/suite/s3/amazon.result b/mysql-test/suite/s3/amazon.result index 7a02fbdfadd..29075118a63 100644 --- a/mysql-test/suite/s3/amazon.result +++ b/mysql-test/suite/s3/amazon.result @@ -3,6 +3,5 @@ set @@global.s3_protocol_version="Original"; create table t1 (pk int primary key, a int); insert into t1 values (1,1),(2,2),(3,3),(4,4); alter table t1 engine=S3; -ERROR HY000: Got error from put_object(database/t1/frm): 8 Access Denied drop table t1; set @@global.s3_protocol_version=@save_s3_protocol_version; diff --git a/mysql-test/suite/s3/amazon.test b/mysql-test/suite/s3/amazon.test index 4cb968831cb..3c64cc2841b 100644 --- a/mysql-test/suite/s3/amazon.test +++ b/mysql-test/suite/s3/amazon.test @@ -17,7 +17,6 @@ set @@global.s3_protocol_version="Original"; create table t1 (pk int primary key, a int); insert into t1 values (1,1),(2,2),(3,3),(4,4); --replace_result $database database ---error 3 alter table t1 engine=S3; drop table t1; diff --git a/storage/maria/libmarias3 b/storage/maria/libmarias3 index e4b7d2ffdbf..a5e32426728 160000 --- a/storage/maria/libmarias3 +++ b/storage/maria/libmarias3 @@ -1 +1 @@ -Subproject commit e4b7d2ffdbf9db3bdd26af0d6a8cc0ed3980571a +Subproject commit a5e32426728aedcbee42f7909cdc11b4d6cc8535