Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update patches
Browse files Browse the repository at this point in the history
csandanov committed Sep 10, 2024
1 parent 584cf01 commit eee359b
Showing 4 changed files with 1,002 additions and 2 deletions.
17 changes: 15 additions & 2 deletions 11/patches/11.4/disable-failing-test.patch
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ index a2da150..fd04ef4 100644
@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c sequence_storage.c)
MY_ADD_TEST(ma_test_loghandler_readonly)

-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
- ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
@@ -14,6 +14,19 @@ index a2da150..fd04ef4 100644
+#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
+# ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
+#MY_ADD_TEST(ma_test_loghandler_nologs)

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
@@ -14,8 +14,8 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA

MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
- byte_order my_tzinfo
- queues stacktrace crc32 LINK_LIBRARIES mysys)
+ byte_order
+ 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})
40 changes: 40 additions & 0 deletions 11/patches/11.4/gcc13.patch
Original file line number Diff line number Diff line change
@@ -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
21 changes: 21 additions & 0 deletions 11/patches/11.4/have-stacktrace.patch
Original file line number Diff line number Diff line change
@@ -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];
926 changes: 926 additions & 0 deletions 11/patches/11.4/lfs64.patch

Large diffs are not rendered by default.

0 comments on commit eee359b

Please sign in to comment.