mirror of
https://github.com/MariaDB/server.git
synced 2025-04-08 08:15:33 +02:00
71d263a198
This commit fixed the problems with S3 after the "DROP TABLE FORCE" changes. It also fixes all failing replication S3 tests. A slave is delayed if it is trying to execute replicated queries on a table that is already converted to S3 by the master later in the binlog. Fixes for replication events on S3 tables for delayed slaves: - INSERT and INSERT ... SELECT and CREATE TABLE are ignored but written to the binary log. UPDATE & DELETE will be fixed in a future commit. Other things: - On slaves with --s3-slave-ignore-updates set, allow S3 tables to be opened in read-write mode. This was done to be able to ignore-but-replicate queries like insert. Without this change any open of an S3 table failed with 'Table is read only' which is too early to be able to replicate the original query. - Errors are now printed if handler::extra() call fails in wait_while_tables_are_used(). - Error message for row changes are changed from HA_ERR_WRONG_COMMAND to HA_ERR_TABLE_READONLY. - Disable some maria_extra() calls for S3 tables. This could cause S3 tables to fail in some cases. - Added missing thr_lock_delete() to ma_open() in case of failure. - Removed from mysql_prepare_insert() the not needed argument 'table'.
100 lines
2.5 KiB
Text
100 lines
2.5 KiB
Text
--source include/have_s3.inc
|
|
--source include/have_sequence.inc
|
|
--source include/have_innodb.inc
|
|
|
|
#
|
|
# Create unique database for running the tests
|
|
#
|
|
--source create_database.inc
|
|
--disable_warnings
|
|
drop table if exists t1,t2,t3;
|
|
--enable_warnings
|
|
|
|
--echo #
|
|
--echo # Test ALTER TABLE to and from s3
|
|
--echo #
|
|
|
|
create table t1 (a int, b int) engine=aria;
|
|
insert into t1 select seq,seq+10 from seq_1_to_1000;
|
|
alter table t1 engine=s3;
|
|
show create table t1;
|
|
alter table t1 comment="hello";
|
|
show create table t1;
|
|
alter table t1 engine=aria;
|
|
show create table t1;
|
|
alter table t1 engine=s3;
|
|
alter table t1 engine=innodb;
|
|
show create table t1;
|
|
select count(*), sum(a), sum(b) from t1;
|
|
drop table t1;
|
|
|
|
--echo #
|
|
--echo # Test ALTER TABLE to and from s3 with rename
|
|
--echo #
|
|
|
|
create table t1 (a int, b int) engine=aria select seq as a,seq+10 as b from seq_1_to_10;
|
|
alter table t1 rename to t2, engine=s3;
|
|
select count(*), sum(a), sum(b) from t2;
|
|
show create table t2;
|
|
alter table t2 rename to t3, engine=aria;
|
|
show create table t3;
|
|
select count(*), sum(a), sum(b) from t3;
|
|
drop table t3;
|
|
|
|
--echo #
|
|
--echo # Test changing options for a s3 table
|
|
--echo #
|
|
|
|
create table t1 (a int, b int) engine=aria select seq as a,seq+10 as b from seq_1_to_1000;
|
|
alter table t1 engine=s3;
|
|
alter table t1 engine=s3, compression_algorithm="zlib";
|
|
show create table t1;
|
|
select count(*), sum(a), sum(b) from t1;
|
|
drop table t1;
|
|
|
|
--echo #
|
|
--echo # Test ALTER TABLE for S3
|
|
--echo #
|
|
|
|
create table t1 (a int, b int) engine=aria select seq as a,seq+10 as b from seq_1_to_10;
|
|
alter table t1 add column c int, engine=s3;
|
|
alter table t1 add column d int;
|
|
show create table t1;
|
|
select count(*), sum(a), sum(b), sum(c), sum(d) from t1;
|
|
drop table t1;
|
|
|
|
--echo #
|
|
--echo # Test ALTER TABLE with locked table for S3
|
|
--echo #
|
|
|
|
create table t1 (a int, b int) engine=aria select seq as a,seq+10 as b from seq_1_to_10;
|
|
lock table t1 write;
|
|
--error ER_OPEN_AS_READONLY
|
|
alter table t1 add column c int, engine=s3;
|
|
unlock tables;
|
|
select count(*), sum(a), sum(b), sum(c) from t1;
|
|
--error ER_OPEN_AS_READONLY
|
|
lock table t1 write;
|
|
lock table t1 read;
|
|
select count(*), sum(a), sum(b), sum(c) from t1;
|
|
unlock tables;
|
|
drop table t1;
|
|
|
|
--echo #
|
|
--echo # Test RENAME TABLE
|
|
--echo #
|
|
|
|
create table t1 (a int, b int) engine=aria select seq as a, seq+10 as b from seq_1_to_10;
|
|
alter table t1 engine=s3;
|
|
rename table t1 to t3;
|
|
alter table t3 rename t2;
|
|
select count(*), sum(a), sum(b) from t2;
|
|
--replace_result $database database
|
|
--error ER_NO_SUCH_TABLE
|
|
select count(*), sum(a), sum(b) from t1;
|
|
drop table t2;
|
|
|
|
#
|
|
# clean up
|
|
#
|
|
--source drop_database.inc
|