From d30ae14c24f434e35b58707c24c69dddd582d98b Mon Sep 17 00:00:00 2001 From: Sergey Vojtovich Date: Fri, 26 Feb 2016 15:32:34 +0400 Subject: Fixed compilarion failure on 32bit systems Compile time assertion "sizeof(struct st_irem) % sizeof(double) == 0" started to fail on 32bit systems after my_thread_id was changed from ulong to int64. Fixed by added padding to struct st_irem on 32bit systems. --- mysys/safemalloc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mysys/safemalloc.c b/mysys/safemalloc.c index 2a484dd1c56..9916650308a 100644 --- a/mysys/safemalloc.c +++ b/mysys/safemalloc.c @@ -55,6 +55,9 @@ struct st_irem struct st_irem *next; /* Linked list of structures */ struct st_irem *prev; /* Other link */ size_t datasize; /* Size requested */ +#if SIZEOF_SIZE_T == 4 + size_t pad; /* Compensate 32bit datasize */ +#endif #ifdef HAVE_BACKTRACE void *frame[SF_REMEMBER_FRAMES]; /* call stack */ #endif -- cgit v1.2.1