Merge branch 'PS-9680-8.0-GCA' into PS-9680-8.4

Author: inikep

mysql-test/suite/rocksdb/r/bulk_load_errors.result

@@ -101,5 +101,5 @@ SET rocksdb_bulk_load=1;
 INSERT INTO t1 VALUES (2);
 INSERT INTO t1 VALUES (22);
 SET rocksdb_bulk_load=0;
-ERROR HY000: [(null)] bulk load error: Operation failed. Try again.: Files cannot be ingested to Lmax. Please make sure key range of Lmax and ongoing compaction's output to Lmaxdoes not overlap with files to ingest.
+ERROR HY000: [(null)] bulk load error: Operation failed. Try again.: Files cannot be ingested to Lmax. Please make sure key range of Lmax does not overlap with files to ingest.
 DROP TABLE t1;

mysql-test/suite/rocksdb/r/bulk_load_use_sst_partitioner.result

@@ -15,7 +15,7 @@ INSERT INTO t2 VALUES(1, 1, 2);
 INSERT INTO t2 VALUES(2, 1, 2);
 INSERT INTO t2 VALUES(3, 2, 2);
 SET rocksdb_bulk_load=0;
-ERROR HY000: [(null)] bulk load error: Operation failed. Try again.: Files cannot be ingested to Lmax. Please make sure key range of Lmax and ongoing compaction's output to Lmaxdoes not overlap with files to ingest.
+ERROR HY000: [(null)] bulk load error: Operation failed. Try again.: Files cannot be ingested to Lmax. Please make sure key range of Lmax does not overlap with files to ingest.
 select * from t2;
 a	b	c
 SET rocksdb_bulk_load_use_sst_partitioner=1;