From f7a931845d9c7030507d668dbd2100f3478f19a3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Thu, 10 Mar 2022 06:26:32 +0000 Subject: [PATCH] Fix various spelling errors still found in code Two upstream PRs remain that have been merged, but not imported on MariaDB 10.6. Gbp-Pq: Name fix-spelling-rocksdb.patch --- storage/rocksdb/rocksdb/db/external_sst_file_ingestion_job.cc | 4 ++-- storage/rocksdb/rocksdb/include/rocksdb/cache.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/storage/rocksdb/rocksdb/db/external_sst_file_ingestion_job.cc b/storage/rocksdb/rocksdb/db/external_sst_file_ingestion_job.cc index 4cec5d376..86aec50c0 100644 --- a/storage/rocksdb/rocksdb/db/external_sst_file_ingestion_job.cc +++ b/storage/rocksdb/rocksdb/db/external_sst_file_ingestion_job.cc @@ -46,7 +46,7 @@ Status ExternalSstFileIngestionJob::Prepare( TablePropertiesCollectorFactory::Context::kUnknownColumnFamily && f.cf_id != cfd_->GetID()) { return Status::InvalidArgument( - "External file column family id dont match"); + "External file column family id don't match"); } } @@ -646,7 +646,7 @@ Status ExternalSstFileIngestionJob::AssignGlobalSeqnoForIngestedFile( return Status::InvalidArgument("Global seqno is required, but disabled"); } else if (file_to_ingest->global_seqno_offset == 0) { return Status::InvalidArgument( - "Trying to set global seqno for a file that dont have a global seqno " + "Trying to set global seqno for a file that don't have a global seqno " "field"); } diff --git a/storage/rocksdb/rocksdb/include/rocksdb/cache.h b/storage/rocksdb/rocksdb/include/rocksdb/cache.h index 77ddf525d..ee27538cf 100644 --- a/storage/rocksdb/rocksdb/include/rocksdb/cache.h +++ b/storage/rocksdb/rocksdb/include/rocksdb/cache.h @@ -60,7 +60,7 @@ struct LRUCacheOptions { // If greater than zero, the LRU list will be split into a high-pri // list and a low-pri list. High-pri entries will be insert to the // tail of high-pri list, while low-pri entries will be first inserted to - // the low-pri list (the midpoint). This is refered to as + // the low-pri list (the midpoint). This is referred to as // midpoint insertion strategy to make entries never get hit in cache // age out faster. // -- 2.30.2