Automerge.

ce55f84d · Alexey Kopytov · d6ca0cbb · 4826b61c · ce55f84d
Commit ce55f84d authored Sep 18, 2009 by Alexey Kopytov
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

mysys/my_largepage.c mysys/my_largepage.c +1 -1

No files found.
--- 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)