Fixes for a few more post-merge test failures

storage/rocksdb/mysql-test/rocksdb/r/bloomfilter.result

@@ -823,7 +823,7 @@ index id2_id4 (id2, id4) COMMENT 'rev:cf_short_prefix',
 index id2_id3_id1_id4 (id2, id3, id1, id4) COMMENT 'rev:cf_short_prefix',
 index id3_id2 (id3, id2) COMMENT 'rev:cf_short_prefix'
 ) engine=ROCKSDB;
-create table t2 (
+create or replace table t2 (
 id1 bigint not null,
 id2 bigint not null,
 id3 varchar(100) not null,
@@ -839,6 +839,10 @@ index id2_id4_id5 (id2, id4, id5) COMMENT 'rev:cf_short_prefix',
 index id3_id4 (id3, id4) COMMENT 'rev:cf_short_prefix',
 index id3_id5 (id3, id5) COMMENT 'rev:cf_short_prefix'
 ) engine=ROCKSDB;
+insert t1
+select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc"
+  from seq_1_to_10000;
+insert t2 select * from t1;
 call bloom_start();
 select count(*) from t1;
 count(*)
@@ -1203,9 +1207,7 @@ count(*)
 call bloom_end();
 checked
 true
-drop table if exists t1;
-drop table if exists t2;
-create table t1 (
+create or replace table t1 (
 id1 bigint not null,
 id2 bigint not null,
 id3 varchar(100) not null,
@@ -1237,6 +1239,10 @@ index id2_id4_id5 (id2, id4, id5) COMMENT 'cf_long_prefix',
 index id3_id4 (id3, id4) COMMENT 'cf_long_prefix',
 index id3_id5 (id3, id5) COMMENT 'cf_long_prefix'
 ) engine=ROCKSDB;
+insert t1
+select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc"
+  from seq_1_to_10000;
+insert t2 select * from t1;
 call bloom_start();
 select count(*) from t1;
 count(*)
@@ -1601,9 +1607,7 @@ count(*)
 call bloom_end();
 checked
 false
-drop table if exists t1;
-drop table if exists t2;
-create table t1 (
+create or replace table t1 (
 id1 bigint not null,
 id2 bigint not null,
 id3 varchar(100) not null,
@@ -1619,7 +1623,7 @@ index id2_id4 (id2, id4) COMMENT 'rev:cf_long_prefix',
 index id2_id3_id1_id4 (id2, id3, id1, id4) COMMENT 'rev:cf_long_prefix',
 index id3_id2 (id3, id2) COMMENT 'rev:cf_long_prefix'
 ) engine=ROCKSDB;
-create table t2 (
+create or replace table t2 (
 id1 bigint not null,
 id2 bigint not null,
 id3 varchar(100) not null,

storage/rocksdb/mysql-test/rocksdb/r/cons_snapshot_read_committed.result

@@ -5,7 +5,7 @@ connection con1;
 CREATE TABLE t1 (a INT, pk INT AUTO_INCREMENT PRIMARY KEY) ENGINE=ROCKSDB;
 SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED;
 START TRANSACTION WITH CONSISTENT SNAPSHOT;
-ERROR: 1938
+ERROR: 4062
 connection con2;
 select * from information_schema.rocksdb_dbstats where stat_type='DB_NUM_SNAPSHOTS';
 STAT_TYPE	VALUE
@@ -18,7 +18,7 @@ STAT_TYPE	VALUE
 DB_NUM_SNAPSHOTS	0
 connection con1;
 START TRANSACTION WITH CONSISTENT SNAPSHOT;
-ERROR: 1938
+ERROR: 4062
 connection con2;
 INSERT INTO t1 (a) VALUES (1);
 connection con1;
@@ -69,7 +69,7 @@ id	value	value2
 5	5	5
 6	6	6
 START TRANSACTION WITH CONSISTENT SNAPSHOT;
-ERROR: 1938
+ERROR: 4062
 connection con2;
 INSERT INTO r1 values (7,7,7);
 connection con1;
@@ -107,12 +107,12 @@ id	value	value2
 7	7	7
 8	8	8
 START TRANSACTION WITH CONSISTENT SNAPSHOT;
-ERROR: 1938
+ERROR: 4062
 connection con2;
 INSERT INTO r1 values (9,9,9);
 connection con1;
 START TRANSACTION WITH CONSISTENT SNAPSHOT;
-ERROR: 1938
+ERROR: 4062
 connection con2;
 INSERT INTO r1 values (10,10,10);
 connection con1;
@@ -129,7 +129,7 @@ id	value	value2
 9	9	9
 10	10	10
 START TRANSACTION WITH CONSISTENT SNAPSHOT;
-ERROR: 1938
+ERROR: 4062
 INSERT INTO r1 values (11,11,11);
 ERROR: 0
 SELECT * FROM r1;

storage/rocksdb/mysql-test/rocksdb/r/cons_snapshot_repeatable_read.result

@@ -125,7 +125,7 @@ id	value	value2
 START TRANSACTION WITH CONSISTENT SNAPSHOT;
 ERROR: 0
 INSERT INTO r1 values (11,11,11);
-ERROR: 1935
+ERROR: 4059
 SELECT * FROM r1;
 id	value	value2
 1	1	1

storage/rocksdb/mysql-test/rocksdb/r/i_s_ddl.result

@@ -11,7 +11,7 @@ TABLE_SCHEMA	TABLE_NAME	PARTITION_NAME	INDEX_NAME	INDEX_TYPE	KV_FORMAT_VERSION	C
 test	is_ddl_t1	NULL	PRIMARY	1	13	default
 test	is_ddl_t1	NULL	j	2	12	default
 test	is_ddl_t1	NULL	k	2	12	kl_cf
-test	is_ddl_t2	NULL	PRIMARY	1	11	zy_cf
-test	is_ddl_t2	NULL	x	2	11	default
+test	is_ddl_t2	NULL	PRIMARY	1	13	zy_cf
+test	is_ddl_t2	NULL	x	2	12	default
 DROP TABLE is_ddl_t1;
 DROP TABLE is_ddl_t2;

storage/rocksdb/mysql-test/rocksdb/t/disabled.def

@@ -7,6 +7,7 @@ level_serializable: Not supported
 slow_query_log: MDEV-11480
 select_for_update_skip_locked_nowait: MDEV-11481
 rpl_read_free: MDEV-10976
+lock_wait_timeout_stats: MDEV-13404
 
 optimizer_loose_index_scans: MariaDB doesnt support Skip Scan