Merge branch 'bb-10.2-mariarocks' into bb-10.2-mariarocks-wlad

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

@@ -99,3 +99,4 @@ ALTER TABLE t1 ADD INDEX kb(b) comment 'rev:cf1', ALGORITHM=INPLACE;
 SHOW CREATE TABLE t1;
 SELECT COUNT(*) FROM t1 FORCE INDEX(kb);
 DROP TABLE t1;
+--remove_file $file

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

@@ -118,3 +118,4 @@ EOF
 # Cleanup
 disconnect other;
 DROP TABLE t1, t2, t3;
+--remove_file $file