From 54c8a4ad6ced81d12168dc9bcb57a8ff26d28d12 Mon Sep 17 00:00:00 2001 From: Gyorgy Sarvari Date: Sat, 21 Mar 2026 21:39:33 +0100 Subject: [PATCH] mariadb: upgrade 10.11.12 -> 10.11.16 10.11 is an LTS version of MariaDB. This upgrade is part of that commitment. Release notes: https://mariadb.com/docs/release-notes/community-server/10.11/10.11.16 https://mariadb.com/docs/release-notes/community-server/10.11/10.11.15 https://mariadb.com/docs/release-notes/community-server/10.11/10.11.14 https://mariadb.com/docs/release-notes/community-server/10.11/10.11.13 Signed-off-by: Gyorgy Sarvari Signed-off-by: Anuj Mittal --- ...iadb-native_10.11.12.bb => mariadb-native_10.11.16.bb} | 0 meta-oe/recipes-dbs/mysql/mariadb.inc | 2 +- ...io_linux-Check-if-syscall-exists-before-using-it.patch | 8 ++++---- ...01-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch | 6 +++--- .../mysql/{mariadb_10.11.12.bb => mariadb_10.11.16.bb} | 0 5 files changed, 8 insertions(+), 8 deletions(-) rename meta-oe/recipes-dbs/mysql/{mariadb-native_10.11.12.bb => mariadb-native_10.11.16.bb} (100%) rename meta-oe/recipes-dbs/mysql/{mariadb_10.11.12.bb => mariadb_10.11.16.bb} (100%) diff --git a/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.12.bb b/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.16.bb similarity index 100% rename from meta-oe/recipes-dbs/mysql/mariadb-native_10.11.12.bb rename to meta-oe/recipes-dbs/mysql/mariadb-native_10.11.16.bb diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index f0cec75568..be310ef80a 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -23,7 +23,7 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://lfs64.patch \ file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ " -SRC_URI[sha256sum] = "d61f23090cfc14f43e8a27c2d3ce7f80247e74481bb26a2d3a6308b8d194e167" +SRC_URI[sha256sum] = "e4f9f2035d38345464ae8abaeaf68380d1ceadbafb4e84744ed2ed5b7aab64e7" UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-aio_linux-Check-if-syscall-exists-before-using-it.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-aio_linux-Check-if-syscall-exists-before-using-it.patch index aba9b9d966..1f6ae13102 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/0001-aio_linux-Check-if-syscall-exists-before-using-it.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-aio_linux-Check-if-syscall-exists-before-using-it.patch @@ -18,13 +18,13 @@ Upstream-Status: Pending tpool/aio_linux.cc | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/tpool/aio_linux.cc b/tpool/aio_linux.cc +diff --git a/tpool/aio_libaio.cc b/tpool/aio_libaio.cc index 4abc213..da75411 100644 ---- a/tpool/aio_linux.cc -+++ b/tpool/aio_linux.cc +--- a/tpool/aio_libaio.cc ++++ b/tpool/aio_libaio.cc @@ -58,6 +58,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 - 1301 USA*/ - */ static int my_getevents(io_context_t ctx, long min_nr, long nr, io_event *ev) + noexcept { +#ifdef __NR_io_getevents int saved_errno= errno; diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch index 456a2bad64..cb8a2a3d2d 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch @@ -18,8 +18,8 @@ diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 241b482..27a3991 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt -@@ -60,11 +60,18 @@ ${CMAKE_BINARY_DIR}/sql - ${CMAKE_SOURCE_DIR}/tpool +@@ -61,11 +61,18 @@ ${CMAKE_BINARY_DIR}/sql + ${CMAKE_BINARY_DIR}/sql ) -ADD_CUSTOM_COMMAND( @@ -41,7 +41,7 @@ index 241b482..27a3991 100644 FIND_PACKAGE(BISON 2.4) -@@ -372,11 +379,18 @@ IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR) +@@ -394,11 +401,18 @@ IF(NOT CMAKE_CROSSCOMPILING OR DEFINED CMAKE_CROSSCOMPILING_EMULATOR) ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc) ENDIF() diff --git a/meta-oe/recipes-dbs/mysql/mariadb_10.11.12.bb b/meta-oe/recipes-dbs/mysql/mariadb_10.11.16.bb similarity index 100% rename from meta-oe/recipes-dbs/mysql/mariadb_10.11.12.bb rename to meta-oe/recipes-dbs/mysql/mariadb_10.11.16.bb