1*39653566SPatrick WilliamsFrom cc5f1d0759b367265a1a000287e2ec15c31eb518 Mon Sep 17 00:00:00 2001 2*39653566SPatrick WilliamsFrom: Mingli Yu <mingli.yu@windriver.com> 3*39653566SPatrick WilliamsDate: Mon, 26 Feb 2024 14:56:02 +0800 4*39653566SPatrick WilliamsSubject: [PATCH] Remove the compile_time_assert lines 5*39653566SPatrick Williams 6*39653566SPatrick WilliamsRemove the problematic compile_time_assert lines to fix the below build 7*39653566SPatrick Williamsfailure on 32-bit arm. 8*39653566SPatrick Williams 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*39653566SPatrick Williams 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*39653566SPatrick Williams 1438 | compile_time_assert(sizeof(MYSQL) == 77*sizeof(void*)+656); 11*39653566SPatrick Williams | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 12*39653566SPatrick Williams 13*39653566SPatrick WilliamsUpstream-Status: Inappropriate [Upstream will bring the asset back 14*39653566SPatrick Williams in a new way [1]] 15*39653566SPatrick Williams[1] https://jira.mariadb.org/browse/MDEV-33429 16*39653566SPatrick Williams 17*39653566SPatrick WilliamsSigned-off-by: Mingli Yu <mingli.yu@windriver.com> 18*39653566SPatrick Williams--- 19*39653566SPatrick Williams tests/mysql_client_fw.c | 8 -------- 20*39653566SPatrick Williams 1 file changed, 8 deletions(-) 21*39653566SPatrick Williams 22*39653566SPatrick Williamsdiff --git a/tests/mysql_client_fw.c b/tests/mysql_client_fw.c 23*39653566SPatrick Williamsindex c9e64678..5c0c7ce2 100644 24*39653566SPatrick Williams--- a/tests/mysql_client_fw.c 25*39653566SPatrick Williams+++ b/tests/mysql_client_fw.c 26*39653566SPatrick Williams@@ -1430,14 +1430,6 @@ int main(int argc, char **argv) 27*39653566SPatrick Williams tests_to_run[i]= NULL; 28*39653566SPatrick Williams } 29*39653566SPatrick Williams 30*39653566SPatrick Williams-#ifdef _WIN32 31*39653566SPatrick Williams- /* must be the same in C/C and embedded, 1208 on 64bit, 968 on 32bit */ 32*39653566SPatrick Williams- compile_time_assert(sizeof(MYSQL) == 60*sizeof(void*)+728); 33*39653566SPatrick Williams-#else 34*39653566SPatrick Williams- /* must be the same in C/C and embedded, 1272 on 64bit, 964 on 32bit */ 35*39653566SPatrick Williams- compile_time_assert(sizeof(MYSQL) == 77*sizeof(void*)+656); 36*39653566SPatrick Williams-#endif 37*39653566SPatrick Williams- 38*39653566SPatrick Williams if (mysql_server_init(embedded_server_arg_count, 39*39653566SPatrick Williams embedded_server_args, 40*39653566SPatrick Williams (char**) embedded_server_groups)) 41*39653566SPatrick Williams-- 42*39653566SPatrick Williams2.25.1 43*39653566SPatrick Williams 44