diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 18:07:29 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 18:07:29 +0000 |
commit | 82a6365993a3c6650c39a1bca3ec3ccba827b763 (patch) | |
tree | 5c5987626fe4696f54de9cdedfa95e0251e4e7b4 /debian/patches/fix-spelling.patch | |
parent | Adding upstream version 1:10.5.12. (diff) | |
download | mariadb-10.5-82a6365993a3c6650c39a1bca3ec3ccba827b763.tar.xz mariadb-10.5-82a6365993a3c6650c39a1bca3ec3ccba827b763.zip |
Adding debian version 1:10.5.12-1.debian/1%10.5.12-1debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | debian/patches/fix-spelling.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/debian/patches/fix-spelling.patch b/debian/patches/fix-spelling.patch new file mode 100644 index 00000000..47d4c632 --- /dev/null +++ b/debian/patches/fix-spelling.patch @@ -0,0 +1,36 @@ +Forwarded: https://github.com/facebook/rocksdb/pull/7785 +Author: Otto Kekäläinen <otto@debian.org> +Subject: Fix various spelling errors still found in code + Two upstream PRs remain that have been merged, but not imported on MariaDB 10.5. + +--- 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::Prep + 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::Assi + 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"); + } + +--- 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. + // |