mariadb: update to 10.11.8 and addon (1)

This commit is contained in:
Rudi Heitbaum 2024-05-18 13:05:48 +00:00
parent 472cf71d19
commit b3b4f80902
2 changed files with 3 additions and 26 deletions

View File

@ -2,9 +2,9 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="mariadb"
PKG_VERSION="10.11.7"
PKG_REV="0"
PKG_SHA256="5239a245ed90517e96396605cd01ccd8f73cd7442d1b3076b6ffe258110e5157"
PKG_VERSION="10.11.8"
PKG_REV="1"
PKG_SHA256="5f04f3e33d9f1cbeff05e79c54d41d302630500c995aee72b0638e2f9dfcdf0f"
PKG_LICENSE="GPL2"
PKG_SITE="https://mariadb.org"
PKG_URL="https://downloads.mariadb.com/MariaDB/${PKG_NAME}-${PKG_VERSION}/source/${PKG_NAME}-${PKG_VERSION}.tar.gz"

View File

@ -1,23 +0,0 @@
Date: Wed, 21 Feb 2024 20:34:12 -0800
Subject: [PATCH] Revert compile_time_assert() changes from "MDEV-32862 MYSQL struct in C/C and server differs"
This partially reverts commit c432c9ef19bf6ff40ab9551bcae202d7e1319878 which
most likely caused the regression that broke builds on many 32-bit platforms.
--- a/tests/mysql_client_fw.c
+++ b/tests/mysql_client_fw.c
@@ -1430,14 +1430,6 @@ int main(int argc, char **argv)
tests_to_run[i]= NULL;
}
-#ifdef _WIN32
- /* must be the same in C/C and embedded, 1208 on 64bit, 968 on 32bit */
- compile_time_assert(sizeof(MYSQL) == 60*sizeof(void*)+728);
-#else
- /* must be the same in C/C and embedded, 1272 on 64bit, 964 on 32bit */
- compile_time_assert(sizeof(MYSQL) == 77*sizeof(void*)+656);
-#endif
-
if (mysql_server_init(embedded_server_arg_count,
embedded_server_args,
(char**) embedded_server_groups))