From 3b086d3fa45d0620abf99cc180023d11d00821b0 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 17 Mar 2025 02:03:30 +0000 Subject: [PATCH] mariadb: fix thread stack overrun and addon (4) ref: https://jira.mariadb.org/browse/MDEV-36051 As worked though and tested and documented in the - https://github.com/MariaDB/server/blob/main/configure.cmake#L668 - https://github.com/MariaDB/server/blob/main/include/my_sys.h#L1021 The following should be set for all except parisc and sparc - STACK_DIRECTION=-1 mariadbd is now starting successfully on releases since 11.4.3. Additionally cleanup default my.cnf [Warning] --innodb-file-per-table is deprecated and will be removed in a future release [Warning] --innodb-flush-method is deprecated and will be removed in a future release --- packages/addons/service/mariadb/package.mk | 4 +--- packages/addons/service/mariadb/source/config/my.cnf | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/addons/service/mariadb/package.mk b/packages/addons/service/mariadb/package.mk index 76310d91d9..5268df562c 100644 --- a/packages/addons/service/mariadb/package.mk +++ b/packages/addons/service/mariadb/package.mk @@ -3,7 +3,7 @@ PKG_NAME="mariadb" PKG_VERSION="11.8.1" -PKG_REV="3" +PKG_REV="4" PKG_SHA256="c58e9e96e8e69dba09aa179b9bea63fc2775f3194efb72dfc2c277abfb9936e5" PKG_LICENSE="GPL2" PKG_SITE="https://mariadb.org" @@ -22,7 +22,6 @@ PKG_ADDON_TYPE="xbmc.service" configure_package() { PKG_CMAKE_OPTS_HOST=" \ -DCMAKE_INSTALL_MESSAGE=NEVER \ - -DSTACK_DIRECTION=-1 \ -DHAVE_IB_GCC_ATOMIC_BUILTINS=1 \ -DCMAKE_CROSSCOMPILING=OFF" @@ -31,7 +30,6 @@ configure_package() { -DCMAKE_BUILD_TYPE=Release \ -DBUILD_CONFIG=mysql_release \ -DFEATURE_SET=classic \ - -DSTACK_DIRECTION=1 \ -DDISABLE_LIBMYSQLCLIENT_SYMBOL_VERSIONING=ON \ -DCMAKE_CROSSCOMPILING=ON \ -DIMPORT_EXECUTABLES=${PKG_BUILD}/.${HOST_NAME}/import_executables.cmake \ diff --git a/packages/addons/service/mariadb/source/config/my.cnf b/packages/addons/service/mariadb/source/config/my.cnf index a11eee28af..a7fe542180 100644 --- a/packages/addons/service/mariadb/source/config/my.cnf +++ b/packages/addons/service/mariadb/source/config/my.cnf @@ -154,10 +154,8 @@ default_storage_engine = InnoDB innodb_buffer_pool_size = 256M innodb_log_buffer_size = 8M -innodb_file_per_table = 1 innodb_open_files = 400 innodb_io_capacity = 400 -innodb_flush_method = O_DIRECT character-set-server=utf8 # This avoids potential pitfalls with text in exotic codepages. #skip-name-resolve # Avoids name resolving in the local network, thus reducing overhead. That also means that all connections are done by IP only. # well, not really according to use cases :(