diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2016-02-26 15:32:34 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2016-02-26 15:32:34 +0400 |
| commit | d30ae14c24f434e35b58707c24c69dddd582d98b (patch) | |
| tree | 16fc354605ef5bfd21333326b55240f718f38e1b /mysys/safemalloc.c | |
| parent | ed990465779add258ebe8a486279cf615449d640 (diff) | |
| download | mariadb-git-d30ae14c24f434e35b58707c24c69dddd582d98b.tar.gz | |
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.
Diffstat (limited to 'mysys/safemalloc.c')
| -rw-r--r-- | mysys/safemalloc.c | 3 |
1 files changed, 3 insertions, 0 deletions
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 |