Merge branch 'bb-10.2-mariarocks' into 10.2

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

 DROP TABLE IF EXISTS t1;
 DROP TABLE IF EXISTS t2;
 DROP TABLE IF EXISTS t3;
+SET GLOBAL ROCKSDB_PAUSE_BACKGROUND_WORK=1;
 create table t1 (a int) engine=rocksdb;
 drop table t1;
 select * from INFORMATION_SCHEMA.ROCKSDB_GLOBAL_INFO;
@@ -12,6 +13,7 @@ DDL_DROP_INDEX_ONGOING	cf_id:0,index_id:max_index_id
 select count(*) from INFORMATION_SCHEMA.ROCKSDB_GLOBAL_INFO;
 count(*)
 4
+SET GLOBAL ROCKSDB_PAUSE_BACKGROUND_WORK=0;
 select VALUE into @keysIn from INFORMATION_SCHEMA.ROCKSDB_COMPACTION_STATS where CF_NAME = 'default' and LEVEL = 'Sum' and TYPE = 'KeyIn';
 CREATE TABLE t1 (i1 INT, i2 INT, PRIMARY KEY (i1)) ENGINE = ROCKSDB;
 INSERT INTO t1 VALUES (1, 1), (2, 2), (3, 3);

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

@@ -67,6 +67,7 @@ lock_wait_timeout_stats: MDEV-13404
 
 compact_deletes: MDEV-12663 : rocksdb.compact_deletes times out and causes other tests to fail
 blind_delete_without_tx_api: MDEV-12286: rocksdb.blind_delete_without_tx_api test fails
+information_schema: MDEV-14372: unstable testcase
 
 ##
 ## Tests that fail for some other reason
@@ -75,4 +76,3 @@ blind_delete_without_tx_api: MDEV-12286: rocksdb.blind_delete_without_tx_api tes
 mysqlbinlog_gtid_skip_empty_trans_rocksdb : MariaRocks: requires GTIDs
 rpl_row_triggers : MariaRocks: requires GTIDs
 
-

storage/rocksdb/mysql-test/rocksdb/t/information_schema.test

@@ -13,6 +13,7 @@ DROP TABLE IF EXISTS t3;
 #   is started on a totally empty datadir, where no MyRocks table has
 #   ever been created). In that case, there is no MAX_INDEX_ID.
 #   Create/drop a table so that we do have MAX_INDEX_ID.
+SET GLOBAL ROCKSDB_PAUSE_BACKGROUND_WORK=1;
 create table t1 (a int) engine=rocksdb;
 drop table t1;
 
@@ -20,6 +21,7 @@ drop table t1;
 --replace_result $max_index_id max_index_id
 select * from INFORMATION_SCHEMA.ROCKSDB_GLOBAL_INFO;
 select count(*) from INFORMATION_SCHEMA.ROCKSDB_GLOBAL_INFO;
+SET GLOBAL ROCKSDB_PAUSE_BACKGROUND_WORK=0;
 
 select VALUE into @keysIn from INFORMATION_SCHEMA.ROCKSDB_COMPACTION_STATS where CF_NAME = 'default' and LEVEL = 'Sum' and TYPE = 'KeyIn';