Update patches

wodby · Sep 10, 2024 · 4f8e851 · 4f8e851
1 parent eee359b
commit 4f8e851
Show file tree

Hide file tree

Showing 12 changed files with 3,024 additions and 0 deletions.
diff --git a/10/patches/10.11/disable-failing-test.patch b/10/patches/10.11/disable-failing-test.patch
@@ -17,3 +17,14 @@ index a2da150..fd04ef4 100644
 
  SET(ma_pagecache_single_src     ma_pagecache_single.c test_file.c test_file.h)
  SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)
+--- a/unittest/mysys/CMakeLists.txt	2020-11-10 14:15:06.000000000 +0100
++++ b/unittest/mysys/CMakeLists.txt	2020-11-24 21:08:46.721183004 +0100
+@@ -15,7 +15,7 @@
+
+ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
+              byte_order
+-             queues stacktrace crc32 LINK_LIBRARIES mysys)
++             queues crc32 LINK_LIBRARIES mysys)
+ MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
+ MY_ADD_TESTS(aes LINK_LIBRARIES  mysys mysys_ssl)
+ ADD_DEFINITIONS(${SSL_DEFINES})
diff --git a/10/patches/10.11/gcc13.patch b/10/patches/10.11/gcc13.patch
@@ -0,0 +1,40 @@
+--- a/storage/rocksdb/rocksdb/util/string_util.h
++++ b/storage/rocksdb/rocksdb/util/string_util.h
+@@ -6,6 +6,7 @@
+
+ #pragma once
+
++#include <cstdint>
+ #include <sstream>
+ #include <string>
+ #include <unordered_map>
+--- a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
++++ b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
+@@ -8,6 +8,7 @@
+ #pragma once
+ #ifndef ROCKSDB_LITE
+
++#include <cstdint>
+ #include <string>
+ #include <vector>
+ #include "rocksdb/status.h"
+--- a/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
++++ b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
+@@ -5,6 +5,7 @@
+
+ #pragma once
+
++#include <cstdint>
+ #include <string>
+ #include <vector>
+
+--- a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
++++ b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
+@@ -6,6 +6,7 @@
+ #pragma once
+
+ #include "rocksdb/rocksdb_namespace.h"
++#include <cstdint>
+
+ struct CompactionIterationStats {
+   // Compaction statistics
diff --git a/10/patches/10.11/have-stacktrace.patch b/10/patches/10.11/have-stacktrace.patch
@@ -0,0 +1,21 @@
+https://jira.mariadb.org/browse/MDEV-24131
+
+diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
+index 8fa0db15b36..67eb099028e 100644
+--- a/unittest/mysys/stacktrace-t.c
++++ b/unittest/mysys/stacktrace-t.c
+@@ -22,6 +22,14 @@
+
+ char b_bss[10];
+
++#ifndef HAVE_STACKTRACE
++int  my_safe_print_str(const char* val, size_t max_len)
++{
++  printf("%*s\n", (int) max_len, val);
++  return 0;
++}
++#endif
++
+ void test_my_safe_print_str()
+ {
+   char b_stack[10];