diff --git a/mysql-test/suite/binlog/r/binlog_mix_unsafe_read_acl_tables_in_dml_ddl.result b/mysql-test/suite/binlog/r/binlog_mix_unsafe_read_acl_tables_in_dml_ddl.result index 2572c0814a90..94c98909f6a8 100644 --- a/mysql-test/suite/binlog/r/binlog_mix_unsafe_read_acl_tables_in_dml_ddl.result +++ b/mysql-test/suite/binlog/r/binlog_mix_unsafe_read_acl_tables_in_dml_ddl.result @@ -879,6 +879,7 @@ include/save_binlog_position.inc DELETE FROM tmp WHERE EXISTS (SELECT * FROM mysql.global_grants); include/assert_binlog_events.inc [!Gtid_or_anon # !Begin # Table_map # Delete_rows # Xid] DROP TABLE tmp; +SET SESSION transaction_isolation = DEFAULT; DROP PROCEDURE proc1; DROP FUNCTION func1; DROP USER u1; diff --git a/mysql-test/suite/binlog/t/binlog_mix_unsafe_read_acl_tables_in_dml_ddl.test b/mysql-test/suite/binlog/t/binlog_mix_unsafe_read_acl_tables_in_dml_ddl.test index 10d9a690aa23..f3e4dd55d929 100644 --- a/mysql-test/suite/binlog/t/binlog_mix_unsafe_read_acl_tables_in_dml_ddl.test +++ b/mysql-test/suite/binlog/t/binlog_mix_unsafe_read_acl_tables_in_dml_ddl.test @@ -123,6 +123,7 @@ while($i <= 4) --inc $i } +SET SESSION transaction_isolation = DEFAULT; DROP PROCEDURE proc1; DROP FUNCTION func1; DROP USER u1; diff --git a/mysql-test/suite/binlog/t/binlog_stm_unsafe_read_acl_tables_in_dml_ddl.test b/mysql-test/suite/binlog/t/binlog_stm_unsafe_read_acl_tables_in_dml_ddl.test index cccb2b0d75fb..fa0399e3c9cd 100644 --- a/mysql-test/suite/binlog/t/binlog_stm_unsafe_read_acl_tables_in_dml_ddl.test +++ b/mysql-test/suite/binlog/t/binlog_stm_unsafe_read_acl_tables_in_dml_ddl.test @@ -1,3 +1,6 @@ +# Uses SERIALIZABLE transaction isolation level +--source include/have_innodb_ddse.inc + # ==== Purpose ==== # # Test warnings for unsafe statements generated from DML or DDL statements diff --git a/mysql-test/suite/innodb/r/innodb_force_recovery.result b/mysql-test/suite/innodb/r/innodb_force_recovery.result index 6a3af0630dd1..f22baa3acb00 100644 --- a/mysql-test/suite/innodb/r/innodb_force_recovery.result +++ b/mysql-test/suite/innodb/r/innodb_force_recovery.result @@ -20,7 +20,7 @@ ERROR HY000: Operation not allowed when innodb_force_recovery > 0. update t1 set f1=3 where f2=2; ERROR HY000: Table 't1' is read only create table t3(f1 int not null)engine=innodb; -ERROR HY000: Running in read-only mode +Got one of the listed errors drop table t3; ERROR 42S02: Unknown table 'test.t3' rename table t1 to t3; @@ -28,7 +28,7 @@ ERROR HY000: Error on rename of './test/t1' to './test/t3' (errno: 165 - Table i truncate table t1; ERROR HY000: Table 't1' is read only create tablespace t4 add datafile 't1.ibd' Engine=InnoDB; -ERROR HY000: Running in read-only mode +Got one of the listed errors # restart drop table t1; show tables; @@ -50,7 +50,7 @@ ERROR HY000: Operation not allowed when innodb_force_recovery > 0. update t2 set f1=3 where f2=2; ERROR HY000: Table 't2' is read only create table t1(f1 int not null)engine=innodb; -ERROR HY000: Running in read-only mode +Got one of the listed errors drop table t1; ERROR 42S02: Unknown table 'test.t1' rename table t2 to t3; @@ -58,7 +58,7 @@ ERROR HY000: Error on rename of './test/t2' to './test/t3' (errno: 165 - Table i truncate table t2; ERROR HY000: Table 't2' is read only create tablespace t1 add datafile 't1.ibd' Engine=InnoDB; -ERROR HY000: Running in read-only mode +Got one of the listed errors drop table t2; ERROR HY000: Storage engine can't drop table 'test.t2' show tables; @@ -80,7 +80,7 @@ ERROR HY000: Operation not allowed when innodb_force_recovery > 0. update t2 set f1=3 where f2=2; ERROR HY000: Can't lock file (errno: 165 - Table is read only) create table t1(f1 int not null)engine=innodb; -ERROR HY000: Running in read-only mode +Got one of the listed errors drop table t1; ERROR 42S02: Unknown table 'test.t1' rename table t2 to t3; @@ -88,7 +88,7 @@ ERROR HY000: Error on rename of './test/t2' to './test/t3' (errno: 165 - Table i truncate table t2; ERROR HY000: Table 't2' is read only create tablespace t1 add datafile 't1.ibd' Engine=InnoDB; -ERROR HY000: Running in read-only mode +Got one of the listed errors drop table t2; ERROR HY000: Storage engine can't drop table 'test.t2' show tables; diff --git a/mysql-test/suite/innodb/r/innodb_read_only-2.result b/mysql-test/suite/innodb/r/innodb_read_only-2.result index 6108570110fe..20944de76bac 100644 --- a/mysql-test/suite/innodb/r/innodb_read_only-2.result +++ b/mysql-test/suite/innodb/r/innodb_read_only-2.result @@ -37,7 +37,7 @@ i LEFT(j,20) 2 bbbbbbbbbbbbbbbbbbbb 3 cccccccccccccccccccc CREATE TABLE t2 ( i int , j blob) ENGINE = Innodb; -ERROR HY000: Running in read-only mode +Got one of the listed errors UPDATE t1 SET i = i+1; ERROR HY000: Can't lock file (errno: 165 - Table is read only) FLUSH STATUS; @@ -105,7 +105,7 @@ i LEFT(j,20) CREATE TABLE t2 ( i int , j blob) ENGINE = Innodb; ERROR 42S01: Table 't2' already exists CREATE TABLE t3 ( i int , j blob) ENGINE = Innodb; -ERROR HY000: Running in read-only mode +Got one of the listed errors UPDATE t1 SET i = i+1; ERROR HY000: Can't lock file (errno: 165 - Table is read only) FLUSH STATUS; diff --git a/mysql-test/suite/innodb/t/create_tablespace.test b/mysql-test/suite/innodb/t/create_tablespace.test index c3d1a8c8e02d..6cfe589e8c3b 100644 --- a/mysql-test/suite/innodb/t/create_tablespace.test +++ b/mysql-test/suite/innodb/t/create_tablespace.test @@ -1,3 +1,6 @@ +# --innodb-read-only does not block DD updates when InnoDB is not the DDSE +--source include/have_innodb_ddse.inc + # # A series of tests to show the correct behavior for # CREATE TABLESPACE and associated SQL statements. diff --git a/mysql-test/suite/innodb/t/innodb_force_recovery.test b/mysql-test/suite/innodb/t/innodb_force_recovery.test index dfe9303dfb04..d15f6cbcca78 100644 --- a/mysql-test/suite/innodb/t/innodb_force_recovery.test +++ b/mysql-test/suite/innodb/t/innodb_force_recovery.test @@ -37,7 +37,7 @@ drop index idx on t1; --error ER_OPEN_AS_READONLY update t1 set f1=3 where f2=2; ---error ER_READ_ONLY_MODE +--error ER_READ_ONLY_MODE,ER_INNODB_READ_ONLY create table t3(f1 int not null)engine=innodb; --error ER_BAD_TABLE_ERROR @@ -49,7 +49,7 @@ rename table t1 to t3; --error ER_OPEN_AS_READONLY truncate table t1; ---error ER_READ_ONLY_MODE +--error ER_READ_ONLY_MODE,ER_INNODB_READ_ONLY create tablespace t4 add datafile 't1.ibd' Engine=InnoDB; let $restart_parameters =; @@ -79,7 +79,7 @@ drop index idx on t2; --error ER_OPEN_AS_READONLY update t2 set f1=3 where f2=2; ---error ER_READ_ONLY_MODE +--error ER_READ_ONLY_MODE,ER_INNODB_READ_ONLY create table t1(f1 int not null)engine=innodb; --error ER_BAD_TABLE_ERROR @@ -91,7 +91,7 @@ rename table t2 to t3; --error ER_OPEN_AS_READONLY truncate table t2; ---error ER_READ_ONLY_MODE +--error ER_READ_ONLY_MODE,ER_INNODB_READ_ONLY create tablespace t1 add datafile 't1.ibd' Engine=InnoDB; --error ER_ENGINE_CANT_DROP_TABLE @@ -119,7 +119,7 @@ drop index idx on t2; --error ER_CANT_LOCK update t2 set f1=3 where f2=2; ---error ER_READ_ONLY_MODE +--error ER_READ_ONLY_MODE,ER_INNODB_READ_ONLY create table t1(f1 int not null)engine=innodb; --error ER_BAD_TABLE_ERROR @@ -131,7 +131,7 @@ rename table t2 to t3; --error ER_OPEN_AS_READONLY truncate table t2; ---error ER_READ_ONLY_MODE +--error ER_READ_ONLY_MODE,ER_INNODB_READ_ONLY create tablespace t1 add datafile 't1.ibd' Engine=InnoDB; --error ER_ENGINE_CANT_DROP_TABLE diff --git a/mysql-test/suite/innodb/t/innodb_read_only-2.test b/mysql-test/suite/innodb/t/innodb_read_only-2.test index 0cabf95c6af7..d02ce2b3e598 100644 --- a/mysql-test/suite/innodb/t/innodb_read_only-2.test +++ b/mysql-test/suite/innodb/t/innodb_read_only-2.test @@ -65,7 +65,7 @@ SELECT i,LEFT(j,20) FROM t1 ORDER BY i; --ERROR ER_CANT_LOCK INSERT INTO t1 VALUES (11,repeat('a',200)),(12,repeat('b',200)),(13,repeat('c',200)); SELECT i,LEFT(j,20) FROM t1 ORDER BY i; ---ERROR ER_READ_ONLY_MODE +--ERROR ER_READ_ONLY_MODE,ER_INNODB_READ_ONLY CREATE TABLE t2 ( i int , j blob) ENGINE = Innodb; --ERROR ER_CANT_LOCK UPDATE t1 SET i = i+1; @@ -136,7 +136,7 @@ INSERT INTO t1 VALUES (11,repeat('a',200)),(12,repeat('b',200)),(13,repeat('c',2 SELECT i,LEFT(j,20) FROM t1 ORDER BY i; --ERROR ER_TABLE_EXISTS_ERROR CREATE TABLE t2 ( i int , j blob) ENGINE = Innodb; ---ERROR ER_READ_ONLY_MODE +--ERROR ER_READ_ONLY_MODE,ER_INNODB_READ_ONLY CREATE TABLE t3 ( i int , j blob) ENGINE = Innodb; --ERROR ER_CANT_LOCK UPDATE t1 SET i = i+1; diff --git a/mysql-test/suite/innodb/t/log_ddl_must_flush.test b/mysql-test/suite/innodb/t/log_ddl_must_flush.test index 7ac3df418f57..789c1fca81eb 100644 --- a/mysql-test/suite/innodb/t/log_ddl_must_flush.test +++ b/mysql-test/suite/innodb/t/log_ddl_must_flush.test @@ -1,3 +1,5 @@ +# Test for DDSE-specific code path in InnoDB +--source include/have_innodb_ddse.inc --source include/have_debug.inc SET DEBUG_SYNC='trx_flush_log_if_needed SIGNAL hit'; diff --git a/mysql-test/suite/innodb/t/sdi.test b/mysql-test/suite/innodb/t/sdi.test index 63a44a8461d5..ad6390dcb73e 100644 --- a/mysql-test/suite/innodb/t/sdi.test +++ b/mysql-test/suite/innodb/t/sdi.test @@ -1,3 +1,5 @@ +# See the upstream comment below +--source include/have_innodb_ddse.inc # # Skip this test when MySQL has been built with other storage engines # than InnoDB, it is because dumping SDI from mysql.ibd diff --git a/mysql-test/suite/innodb_gis/r/geometry.result b/mysql-test/suite/innodb_gis/r/geometry.result index 9065812aff9d..5113360a594c 100644 --- a/mysql-test/suite/innodb_gis/r/geometry.result +++ b/mysql-test/suite/innodb_gis/r/geometry.result @@ -1,13 +1,6 @@ SET default_storage_engine=InnoDB; SET innodb_strict_mode=OFF; SET SESSION debug="+d,row_print_geometry_data"; -SHOW VARIABLES LIKE '%storage_engine%'; -Variable_name Value -default_dd_storage_engine InnoDB -default_storage_engine InnoDB -default_tmp_storage_engine InnoDB -disabled_storage_engines -internal_tmp_mem_storage_engine TempTable USE test; DROP TABLE IF EXISTS t1, gis_point, gis_line, gis_polygon; DROP TABLE IF EXISTS gis_multi_point, gis_multi_line, gis_multi_polygon; diff --git a/mysql-test/suite/innodb_gis/t/geometry.test b/mysql-test/suite/innodb_gis/t/geometry.test index f3b8057e5a38..c62c90e69c8d 100644 --- a/mysql-test/suite/innodb_gis/t/geometry.test +++ b/mysql-test/suite/innodb_gis/t/geometry.test @@ -17,8 +17,6 @@ SET innodb_strict_mode=OFF; # Turn on the geometry data print. SET SESSION debug="+d,row_print_geometry_data"; -SHOW VARIABLES LIKE '%storage_engine%'; - # # Spatial objects # diff --git a/mysql-test/suite/innodb_undo/r/undo_settings.result b/mysql-test/suite/innodb_undo/r/undo_settings.result index 4444890eaa4b..89f98f959efc 100644 --- a/mysql-test/suite/innodb_undo/r/undo_settings.result +++ b/mysql-test/suite/innodb_undo/r/undo_settings.result @@ -601,7 +601,7 @@ COUNT(*) 9 # restart: --innodb_read_only --innodb_rollback_segments=8 CREATE UNDO TABLESPACE `undo_007` ADD DATAFILE 'undo_007.ibu'; -ERROR HY000: Running in read-only mode +Got one of the listed errors SHOW VARIABLES LIKE 'innodb_rollback_segments'; Variable_name Value innodb_rollback_segments 7 diff --git a/mysql-test/suite/innodb_undo/t/undo_settings.test b/mysql-test/suite/innodb_undo/t/undo_settings.test index b02d3488d534..9cd32fe5cddb 100644 --- a/mysql-test/suite/innodb_undo/t/undo_settings.test +++ b/mysql-test/suite/innodb_undo/t/undo_settings.test @@ -334,7 +334,7 @@ SELECT COUNT(*) FROM t3; let $restart_parameters = restart: --innodb_read_only --innodb_rollback_segments=8; --source include/restart_mysqld.inc disconnect con1; ---error ER_READ_ONLY_MODE +--error ER_READ_ONLY_MODE,ER_INNODB_READ_ONLY CREATE UNDO TABLESPACE `undo_007` ADD DATAFILE 'undo_007.ibu'; SHOW VARIABLES LIKE 'innodb_rollback_segments'; SHOW GLOBAL STATUS LIKE '%undo%'; diff --git a/mysql-test/suite/rpl_gtid/t/rpl_wait_for_semi_sync_ack.cnf b/mysql-test/suite/rpl_gtid/t/rpl_wait_for_semi_sync_ack.cnf index e6e0f3df0eac..a4e3745e6bd4 100644 --- a/mysql-test/suite/rpl_gtid/t/rpl_wait_for_semi_sync_ack.cnf +++ b/mysql-test/suite/rpl_gtid/t/rpl_wait_for_semi_sync_ack.cnf @@ -5,15 +5,15 @@ rpl_semi_sync_master_enabled= 1 rpl_wait_for_semi_sync_ack= 1 rpl_semi_sync_master_timeout= 10000000 rpl_semi_sync_master_wait_no_slave= 1 -loose_rocksdb=0 +loose-rocksdb=0 [mysqld.2] -loose_rocksdb=0 +loose-rocksdb=0 [mysqld.3] rpl_semi_sync_slave_enabled= 1 rpl_semi_sync_master_wait_no_slave= 1 -loose_rocksdb=0 +loose-rocksdb=0 [ENV] SERVER_MYPORT_3= @mysqld.3.port diff --git a/mysql-test/t/commit_1innodb.test b/mysql-test/t/commit_1innodb.test index 3f68acddfce9..4c129371bd9e 100644 --- a/mysql-test/t/commit_1innodb.test +++ b/mysql-test/t/commit_1innodb.test @@ -1,3 +1,6 @@ +# Handler counter values are bumped differently between InnoDB and MyRocks DDSEs +-- source include/have_innodb_ddse.inc + -- source include/force_binlog_format_statement.inc call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT"); diff --git a/mysql-test/t/partition_locking.test b/mysql-test/t/partition_locking.test index 4909ede2d833..849dea7af390 100644 --- a/mysql-test/t/partition_locking.test +++ b/mysql-test/t/partition_locking.test @@ -1,3 +1,5 @@ +# Handler counter values are bumped differently between InnoDB and MyRocks DDSEs +--source include/have_innodb_ddse.inc # Test have expected differences in count of commit and prepare handlers # when run with and without binlog and/or with different binlog formats. diff --git a/mysql-test/t/rename.test b/mysql-test/t/rename.test index 383910c91000..14cf117fcce0 100644 --- a/mysql-test/t/rename.test +++ b/mysql-test/t/rename.test @@ -1,3 +1,6 @@ +# Multiple FK operations in a single SQL statement depend on the READ +# UNCOMMITTED support +--source include/have_innodb_ddse.inc # # Test of rename table diff --git a/mysql-test/t/unsafe_binlog_innodb.test b/mysql-test/t/unsafe_binlog_innodb.test index 081e0fb09594..9a1ba7b18166 100644 --- a/mysql-test/t/unsafe_binlog_innodb.test +++ b/mysql-test/t/unsafe_binlog_innodb.test @@ -1,3 +1,5 @@ +# Test uses SERIALIZABLE transaction isolation level +--source include/have_innodb_ddse.inc # t/unsafe_binlog_innodb.test # # Note that this test uses at least in case of InnoDB options