Skip to content

Commit

Permalink
Merge pull request #8756 from heitbaum/mariadb
Browse files Browse the repository at this point in the history
mariadb: workaround fix for arm32 compiles of 10.11.7
  • Loading branch information
CvH committed Mar 23, 2024
2 parents c0d63b3 + 9278e60 commit 353213e
Showing 1 changed file with 23 additions and 0 deletions.
@@ -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))

0 comments on commit 353213e

Please sign in to comment.