diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-23 15:22:21 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-23 15:22:21 +0400 |
| commit | 2dc132b209ef375d7d36a41a2429be001d8e5f45 (patch) | |
| tree | 9a94748e3f29d58645ae7979faaf09464080033d /mysys/my_largepage.c | |
| parent | f3d58bae2011dc043d75268a98e65731da622603 (diff) | |
| parent | 75116feb4b8976df3078f288f31fec7f46462461 (diff) | |
| download | mariadb-git-2dc132b209ef375d7d36a41a2429be001d8e5f45.tar.gz | |
Merge from mysql-next-mr.
Diffstat (limited to 'mysys/my_largepage.c')
| -rw-r--r-- | mysys/my_largepage.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_largepage.c b/mysys/my_largepage.c index 9fa5b73bf88..d96e1048fd0 100644 --- a/mysys/my_largepage.c +++ b/mysys/my_largepage.c @@ -121,7 +121,7 @@ uchar* my_large_malloc_int(size_t size, myf my_flags) DBUG_ENTER("my_large_malloc_int"); /* Align block size to my_large_page_size */ - size = ((size - 1) & ~(my_large_page_size - 1)) + my_large_page_size; + size= MY_ALIGN(size, (size_t) my_large_page_size); shmid = shmget(IPC_PRIVATE, size, SHM_HUGETLB | SHM_R | SHM_W); if (shmid < 0) |