diff --git a/mysql-test/suite/rocksdb/r/bulk_load_errors.result b/mysql-test/suite/rocksdb/r/bulk_load_errors.result index 36adda2bb249..cb46122f8874 100644 --- a/mysql-test/suite/rocksdb/r/bulk_load_errors.result +++ b/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; diff --git a/mysql-test/suite/rocksdb/r/bulk_load_use_sst_partitioner.result b/mysql-test/suite/rocksdb/r/bulk_load_use_sst_partitioner.result index 8727f61a2ce2..2168745b6097 100644 --- a/mysql-test/suite/rocksdb/r/bulk_load_use_sst_partitioner.result +++ b/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; diff --git a/storage/rocksdb/rocksdb b/storage/rocksdb/rocksdb index 2864cd95ca72..3dd5f9a3f9ad 160000 --- a/storage/rocksdb/rocksdb +++ b/storage/rocksdb/rocksdb @@ -1 +1 @@ -Subproject commit 2864cd95ca72bc4a2e93fe461dbd980f8e2357be +Subproject commit 3dd5f9a3f9add8d211d8b31a1c365bacdfc5ee27