Commit 06a884a5 authored by Sergei Golubchik's avatar Sergei Golubchik

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

parent 8fd515e0
...@@ -1430,12 +1430,14 @@ int main(int argc, char **argv) ...@@ -1430,12 +1430,14 @@ int main(int argc, char **argv)
tests_to_run[i]= NULL; tests_to_run[i]= NULL;
} }
#ifdef _WIN32 /*
/* must be the same in C/C and embedded, 1208 on 64bit, 968 on 32bit */ this limited check is enough, if sizeof(MYSQL) changes, it changes
compile_time_assert(sizeof(MYSQL) == 60*sizeof(void*)+728); everywhere
#else */
/* must be the same in C/C and embedded, 1272 on 64bit, 964 on 32bit */ #if defined __x86_64__
compile_time_assert(sizeof(MYSQL) == 77*sizeof(void*)+656); compile_time_assert(sizeof(MYSQL) == 1272);
#elif defined __i386__
compile_time_assert(sizeof(MYSQL) == 964);
#endif #endif
if (mysql_server_init(embedded_server_arg_count, if (mysql_server_init(embedded_server_arg_count,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment