summaryrefslogtreecommitdiffstats
path: root/debian/patches/1063738-revert-c432c9ef.patch
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 13:39:47 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 13:39:47 +0000
commit00d8329673e49f802186a07a2f878f0d034b118f (patch)
tree8e219ebc4f9dfdad63d7df9a8d886fcdd9a1b8e0 /debian/patches/1063738-revert-c432c9ef.patch
parentAdding debian version 1:10.11.7-1. (diff)
downloadmariadb-00d8329673e49f802186a07a2f878f0d034b118f.tar.xz
mariadb-00d8329673e49f802186a07a2f878f0d034b118f.zip
Adding debian version 1:10.11.7-2.debian/1%10.11.7-2
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/1063738-revert-c432c9ef.patch')
-rw-r--r--debian/patches/1063738-revert-c432c9ef.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/debian/patches/1063738-revert-c432c9ef.patch b/debian/patches/1063738-revert-c432c9ef.patch
new file mode 100644
index 00000000..d13fa9db
--- /dev/null
+++ b/debian/patches/1063738-revert-c432c9ef.patch
@@ -0,0 +1,23 @@
+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))