From: Otto Kekäläinen <otto@debian.org>
Date: Thu, 4 Jul 2024 07:03:58 +0000 (-0700)
Subject: [PATCH] Make compile_time_assert compatible with x32 (Closes: #1063738)
X-Git-Tag: archive/raspbian/1%11.4.2-4+rpi1^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0b787bf04935c7caa76b62767357435d53375e81;p=mariadb.git

[PATCH] Make compile_time_assert compatible with x32 (Closes: #1063738)

    The x32 build was failing on:

        compile_time_assert(sizeof(MYSQL) == 77*sizeof(void*)+656);

    Reported upstream at https://jira.mariadb.org/browse/MDEV-34195.
    This is a regression from upstream commits c432c9ef and 06a884a57071.

    Fix is based on advice from https://lists.debian.org/debian-amd64/2024/07/msg00003.html
    which is also aligned with https://wiki.debian.org/X32Port.


Gbp-Pq: Name 1063738-x32-compile-time-assert.patch
---

diff --git a/tests/mysql_client_fw.c b/tests/mysql_client_fw.c
index 9f0faf850..b8794d03e 100644
--- a/tests/mysql_client_fw.c
+++ b/tests/mysql_client_fw.c
@@ -1442,7 +1442,7 @@ int main(int argc, char **argv)
   this limited check is enough, if sizeof(MYSQL) changes, it changes
   everywhere
 */
-#if defined __x86_64__
+#if defined(__x86_64__) && !defined(__ILP32__)
   compile_time_assert(sizeof(MYSQL) == 1272);
 #elif defined __i386__
   compile_time_assert(sizeof(MYSQL) == 964);