mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-33429 compilation of MariaDB 10.11.7 fails on arm32, sizeof(MYSQL) is wrong

Browse source
This commit is contained in:
Sergei Golubchik 2024-02-25 19:00:48 +01:00
parent 8fd515e0d2
commit 06a884a570
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tests/mysql_client_fw.c
View file

@ -1430,12 +1430,14 @@ 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);
/*
this limited check is enough, if sizeof(MYSQL) changes, it changes
everywhere
*/
#if defined __x86_64__
compile_time_assert(sizeof(MYSQL) == 1272);
#elif defined __i386__
compile_time_assert(sizeof(MYSQL) == 964);
#endif
if (mysql_server_init(embedded_server_arg_count,