1From cc5f1d0759b367265a1a000287e2ec15c31eb518 Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Mon, 26 Feb 2024 14:56:02 +0800
4Subject: [PATCH] Remove the compile_time_assert lines
5
6Remove the problematic compile_time_assert lines to fix the below build
7failure on 32-bit arm.
8 In file included from TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/mariadb/10.11.7/mariadb-10.11.7/tests/mysql_client_test.c:38:
9 TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/mariadb/10.11.7/mariadb-10.11.7/tests/mysql_client_fw.c:1438:3: error: 'compile_time_assert' declared as an array with a negative size
10  1438 |   compile_time_assert(sizeof(MYSQL) == 77*sizeof(void*)+656);
11       |   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
12
13Upstream-Status: Inappropriate [Upstream will bring the asset back
14                                in a new way [1]]
15[1] https://jira.mariadb.org/browse/MDEV-33429
16
17Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
18---
19 tests/mysql_client_fw.c | 8 --------
20 1 file changed, 8 deletions(-)
21
22diff --git a/tests/mysql_client_fw.c b/tests/mysql_client_fw.c
23index c9e64678..5c0c7ce2 100644
24--- a/tests/mysql_client_fw.c
25+++ b/tests/mysql_client_fw.c
26@@ -1430,14 +1430,6 @@ int main(int argc, char **argv)
27     tests_to_run[i]= NULL;
28   }
29
30-#ifdef _WIN32
31-  /* must be the same in C/C and embedded, 1208 on 64bit, 968 on 32bit */
32-  compile_time_assert(sizeof(MYSQL) == 60*sizeof(void*)+728);
33-#else
34-  /* must be the same in C/C and embedded, 1272 on 64bit, 964 on 32bit */
35-  compile_time_assert(sizeof(MYSQL) == 77*sizeof(void*)+656);
36-#endif
37-
38   if (mysql_server_init(embedded_server_arg_count,
39                         embedded_server_args,
40                         (char**) embedded_server_groups))
41--
422.25.1
43
44