From 3e958fabe9aba50eed664e99e98af8a0f957f511 Mon Sep 17 00:00:00 2001 From: Yogita Urade Date: Wed, 14 May 2025 10:40:23 +0530 Subject: mariadb: upgrade 11.4.5 -> 11.4.6 This upgrade includes fix for CVE-2023-52971 Changelog: https://mariadb.com/kb/en/mariadb-11-4-6-changelog/ refresh 0001-Add-missing-includes-cstdint-and-cstdio.patch Droped 3871.patch and mm_malloc.patch as these are available in 11.4.6 Signed-off-by: Yogita Urade Signed-off-by: Khem Raj --- ...1-Add-missing-includes-cstdint-and-cstdio.patch | 40 ++++++++-------------- 1 file changed, 15 insertions(+), 25 deletions(-) (limited to 'meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch') diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch index 08e73424d1..bc1b992919 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch @@ -11,27 +11,14 @@ Upstream-Status: Pending Signed-off-by: Khem Raj Signed-off-by: Mingli Yu --- - .../rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h | 1 + - storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h | 1 + - .../rocksdb/rocksdb/table/block_based/data_block_hash_index.h | 1 + - storage/rocksdb/rocksdb/util/slice.cc | 1 + - storage/rocksdb/rocksdb/util/string_util.h | 1 + - 5 files changed, 5 insertions(+) + storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h | 1 + + .../rocksdb/rocksdb/table/block_based/data_block_hash_index.h | 1 + + storage/rocksdb/rocksdb/util/slice.cc | 2 +- + storage/rocksdb/rocksdb/util/string_util.h | 1 + + 4 files changed, 4 insertions(+), 1 deletion(-) -diff --git a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h -index 963c1d8e..73487edd 100644 ---- a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h -+++ b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h -@@ -5,6 +5,7 @@ - - #pragma once - -+#include - #include "rocksdb/rocksdb_namespace.h" - - struct CompactionIterationStats { diff --git a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h -index c7f93b4c..3c2ab805 100644 +index 7fb9d489..f7b4e6f0 100644 --- a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h +++ b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h @@ -8,6 +8,7 @@ @@ -55,19 +42,20 @@ index f356395f..32152217 100644 #include diff --git a/storage/rocksdb/rocksdb/util/slice.cc b/storage/rocksdb/rocksdb/util/slice.cc -index 6db11cc9..c26b6a21 100644 +index 3c3656de..b18d7f5d 100644 --- a/storage/rocksdb/rocksdb/util/slice.cc +++ b/storage/rocksdb/rocksdb/util/slice.cc -@@ -8,6 +8,7 @@ - // found in the LICENSE file. See the AUTHORS file for names of contributors. +@@ -12,7 +12,7 @@ + #include #include +- +#include + #include "rocksdb/convenience.h" #include "rocksdb/slice_transform.h" - #include "rocksdb/slice.h" - #include "util/string_util.h" + #include "rocksdb/utilities/object_registry.h" diff --git a/storage/rocksdb/rocksdb/util/string_util.h b/storage/rocksdb/rocksdb/util/string_util.h -index a761be66..064d059f 100644 +index 7794dbb0..b480177e 100644 --- a/storage/rocksdb/rocksdb/util/string_util.h +++ b/storage/rocksdb/rocksdb/util/string_util.h @@ -6,6 +6,7 @@ @@ -78,3 +66,5 @@ index a761be66..064d059f 100644 #include #include #include +-- +2.40.0 -- cgit v1.2.3-54-g00ecf