Skip to content

Commit a71e9ca

Browse files
csandanovcsandanov
committed
Add mariadb 11.8, drop 10.5 (eol), update alpine linux to 3.22
1 parent 87e4695 commit a71e9ca

File tree

10 files changed

+1312
-101
lines changed

10 files changed

+1312
-101
lines changed

‎.alpine‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.20#2025-10-25T04:42:44.781847Z
1+
3.22#2025-10-25T04:42:44.781847Z

‎.github/workflows/workflow.yml‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ on:
1010

1111
env:
1212
BASE_IMAGE_STABILITY_TAG: 2.18.4
13+
MARIADB118: '11.8.5'
1314
MARIADB114: '11.4.9'
1415
MARIADB1011: '10.11.15'
1516
MARIADB106: '10.6.24'
16-
MARIADB105: '10.5.29'
1717

1818
jobs:
19-
mariadb114-build:
19+
mariadb118-build:
2020
strategy:
2121
matrix:
2222
arch:
@@ -29,38 +29,38 @@ jobs:
2929
runner: ubuntu-24.04-arm
3030
runs-on: ${{ matrix.runner }}
3131
steps:
32-
- uses: actions/checkout@v4
32+
- uses: actions/checkout@v5
3333
- uses: docker/login-action@v3
3434
with:
3535
username: ${{ secrets.DOCKER_USERNAME }}
3636
password: ${{ secrets.DOCKER_PASSWORD }}
3737
- name: build and push
3838
env:
39-
MARIADB_VER: ${{ env.MARIADB114 }}
39+
MARIADB_VER: ${{ env.MARIADB118 }}
4040
ARCH: ${{ matrix.arch }}
41-
working-directory: 11
41+
working-directory: '11'
4242
run: |
4343
make
4444
make test
4545
make push
46-
mariadb114-push:
46+
mariadb118-push:
4747
runs-on: ubuntu-latest
4848
needs:
49-
- mariadb114-build
49+
- mariadb118-build
5050
steps:
51-
- uses: actions/checkout@v4
51+
- uses: actions/checkout@v5
5252
- uses: docker/login-action@v3
5353
with:
5454
username: ${{ secrets.DOCKER_USERNAME }}
5555
password: ${{ secrets.DOCKER_PASSWORD }}
5656
- uses: ./.github/actions
5757
with:
58-
version: ${{ env.MARIADB114 }}
58+
version: ${{ env.MARIADB118 }}
5959
workdir: 11
6060
latest: true
6161
latest_major: true
62-
63-
mariadb1011-build:
62+
63+
mariadb114-build:
6464
strategy:
6565
matrix:
6666
arch:
@@ -73,37 +73,36 @@ jobs:
7373
runner: ubuntu-24.04-arm
7474
runs-on: ${{ matrix.runner }}
7575
steps:
76-
- uses: actions/checkout@v4
76+
- uses: actions/checkout@v5
7777
- uses: docker/login-action@v3
7878
with:
7979
username: ${{ secrets.DOCKER_USERNAME }}
8080
password: ${{ secrets.DOCKER_PASSWORD }}
8181
- name: build and push
8282
env:
83-
MARIADB_VER: ${{ env.MARIADB1011 }}
83+
MARIADB_VER: ${{ env.MARIADB114 }}
8484
ARCH: ${{ matrix.arch }}
85-
working-directory: 10
85+
working-directory: '11'
8686
run: |
8787
make
8888
make test
8989
make push
90-
mariadb1011-push:
90+
mariadb114-push:
9191
runs-on: ubuntu-latest
9292
needs:
93-
- mariadb1011-build
93+
- mariadb114-build
9494
steps:
95-
- uses: actions/checkout@v4
95+
- uses: actions/checkout@v5
9696
- uses: docker/login-action@v3
9797
with:
9898
username: ${{ secrets.DOCKER_USERNAME }}
9999
password: ${{ secrets.DOCKER_PASSWORD }}
100100
- uses: ./.github/actions
101101
with:
102-
version: ${{ env.MARIADB1011 }}
103-
workdir: 10
104-
latest_major: true
102+
version: ${{ env.MARIADB114 }}
103+
workdir: 11
105104

106-
mariadb106-build:
105+
mariadb1011-build:
107106
strategy:
108107
matrix:
109108
arch:
@@ -116,36 +115,37 @@ jobs:
116115
runner: ubuntu-24.04-arm
117116
runs-on: ${{ matrix.runner }}
118117
steps:
119-
- uses: actions/checkout@v4
118+
- uses: actions/checkout@v5
120119
- uses: docker/login-action@v3
121120
with:
122121
username: ${{ secrets.DOCKER_USERNAME }}
123122
password: ${{ secrets.DOCKER_PASSWORD }}
124123
- name: build and push
125124
env:
126-
MARIADB_VER: ${{ env.MARIADB106 }}
125+
MARIADB_VER: ${{ env.MARIADB1011 }}
127126
ARCH: ${{ matrix.arch }}
128-
working-directory: 10
127+
working-directory: '10'
129128
run: |
130129
make
131130
make test
132131
make push
133-
mariadb106-push:
132+
mariadb1011-push:
134133
runs-on: ubuntu-latest
135134
needs:
136-
- mariadb106-build
135+
- mariadb1011-build
137136
steps:
138-
- uses: actions/checkout@v4
137+
- uses: actions/checkout@v5
139138
- uses: docker/login-action@v3
140139
with:
141140
username: ${{ secrets.DOCKER_USERNAME }}
142141
password: ${{ secrets.DOCKER_PASSWORD }}
143142
- uses: ./.github/actions
144143
with:
145-
version: ${{ env.MARIADB106 }}
144+
version: ${{ env.MARIADB1011 }}
146145
workdir: 10
146+
latest_major: true
147147

148-
mariadb105-build:
148+
mariadb106-build:
149149
strategy:
150150
matrix:
151151
arch:
@@ -158,31 +158,31 @@ jobs:
158158
runner: ubuntu-24.04-arm
159159
runs-on: ${{ matrix.runner }}
160160
steps:
161-
- uses: actions/checkout@v4
161+
- uses: actions/checkout@v5
162162
- uses: docker/login-action@v3
163163
with:
164164
username: ${{ secrets.DOCKER_USERNAME }}
165165
password: ${{ secrets.DOCKER_PASSWORD }}
166166
- name: build and push
167167
env:
168-
MARIADB_VER: ${{ env.MARIADB105 }}
168+
MARIADB_VER: ${{ env.MARIADB106 }}
169169
ARCH: ${{ matrix.arch }}
170-
working-directory: 10
170+
working-directory: '10'
171171
run: |
172172
make
173173
make test
174174
make push
175-
mariadb105-push:
175+
mariadb106-push:
176176
runs-on: ubuntu-latest
177177
needs:
178-
- mariadb105-build
178+
- mariadb106-build
179179
steps:
180-
- uses: actions/checkout@v4
180+
- uses: actions/checkout@v5
181181
- uses: docker/login-action@v3
182182
with:
183183
username: ${{ secrets.DOCKER_USERNAME }}
184184
password: ${{ secrets.DOCKER_PASSWORD }}
185185
- uses: ./.github/actions
186186
with:
187-
version: ${{ env.MARIADB105 }}
187+
version: ${{ env.MARIADB106 }}
188188
workdir: 10

‎10/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ MARIADB_VER_MINOR = $(shell echo "${MARIADB_VER}" | grep -oE '^[0-9]+\.[0-9]+')
66
GALERA_VER ?=
77
WSREP_VER ?= $(shell echo "${GALERA_VER}" | grep -oE '^[0-9]+')
88

9-
ALPINE_VER ?= 3.20
9+
ALPINE_VER ?= 3.22
1010

1111
NPROC =
1212

‎11/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
-include env_make
22

3-
MARIADB_VER ?= 11.4.9
3+
MARIADB_VER ?= 11.8.5
44
MARIADB_VER_MINOR = $(shell echo "${MARIADB_VER}" | grep -oE '^[0-9]+\.[0-9]+')
55

66
GALERA_VER ?=
77
WSREP_VER ?= $(shell echo "${GALERA_VER}" | grep -oE '^[0-9]+')
88

9-
ALPINE_VER ?= 3.21
9+
ALPINE_VER ?= 3.22
1010

1111
NPROC =
1212

‎11/patches/11.8/disable-failing-test.patch‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
diff --git a/storage/maria/unittest/CMakeLists.txt b/storage/maria/unittest/CMakeLists.txt
2+
index a2da150..fd04ef4 100644
3+
--- a/storage/maria/unittest/CMakeLists.txt
4+
+++ b/storage/maria/unittest/CMakeLists.txt
5+
@@ -60,10 +60,10 @@ ADD_EXECUTABLE(ma_test_loghandler_readonly-t
6+
ma_test_loghandler_multigroup-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c sequence_storage.c)
7+
MY_ADD_TEST(ma_test_loghandler_readonly)
8+
9+
-SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
10+
-ADD_EXECUTABLE(ma_test_loghandler_nologs-t
11+
- ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
12+
-MY_ADD_TEST(ma_test_loghandler_nologs)
13+
+#SET_TARGET_PROPERTIES(ma_test_loghandler_readonly-t PROPERTIES COMPILE_FLAGS "-DREADONLY_TEST")
14+
+#ADD_EXECUTABLE(ma_test_loghandler_nologs-t
15+
+# ma_test_loghandler_nologs-t.c ma_maria_log_cleanup.c ma_loghandler_examples.c)
16+
+#MY_ADD_TEST(ma_test_loghandler_nologs)
17+
18+
SET(ma_pagecache_single_src ma_pagecache_single.c test_file.c test_file.h)
19+
SET(ma_pagecache_consist_src ma_pagecache_consist.c test_file.c test_file.h)

‎11/patches/11.8/gcc13.patch‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
--- a/storage/rocksdb/rocksdb/util/string_util.h
2+
+++ b/storage/rocksdb/rocksdb/util/string_util.h
3+
@@ -6,6 +6,7 @@
4+
5+
#pragma once
6+
7+
+#include <cstdint>
8+
#include <sstream>
9+
#include <string>
10+
#include <unordered_map>
11+
--- a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
12+
+++ b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h
13+
@@ -8,6 +8,7 @@
14+
#pragma once
15+
#ifndef ROCKSDB_LITE
16+
17+
+#include <cstdint>
18+
#include <string>
19+
#include <vector>
20+
#include "rocksdb/status.h"
21+
--- a/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
22+
+++ b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h
23+
@@ -5,6 +5,7 @@
24+
25+
#pragma once
26+
27+
+#include <cstdint>
28+
#include <string>
29+
#include <vector>
30+
31+
--- a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
32+
+++ b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h
33+
@@ -6,6 +6,7 @@
34+
#pragma once
35+
36+
#include "rocksdb/rocksdb_namespace.h"
37+
+#include <cstdint>
38+
39+
struct CompactionIterationStats {
40+
// Compaction statistics

‎11/patches/11.8/have-stacktrace.patch‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
https://jira.mariadb.org/browse/MDEV-24131
2+
3+
diff --git a/unittest/mysys/stacktrace-t.c b/unittest/mysys/stacktrace-t.c
4+
index 8fa0db15b36..67eb099028e 100644
5+
--- a/unittest/mysys/stacktrace-t.c
6+
+++ b/unittest/mysys/stacktrace-t.c
7+
@@ -22,6 +22,14 @@
8+
9+
char b_bss[10];
10+
11+
+#ifndef HAVE_STACKTRACE
12+
+int my_safe_print_str(const char* val, size_t max_len)
13+
+{
14+
+ printf("%*s\n", (int) max_len, val);
15+
+ return 0;
16+
+}
17+
+#endif
18+
+
19+
void test_my_safe_print_str()
20+
{
21+
char b_stack[10];

0 commit comments

Comments
 (0)