diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-04-05 10:49:38 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-04-05 10:49:38 +0200 |
| commit | d4b30a7a84742ae03774fe25af2cbad144ba2d5d (patch) | |
| tree | d65a66f9f2f9378a1f4ca014e18952ae514f4cb1 /storage/innobase/os/os0proc.c | |
| parent | d993ce1bbf8413a0aaf5a524a11334359234c5f4 (diff) | |
| parent | cea2c5d28ead6ae4191aea164df9b80b41a743ad (diff) | |
| download | mariadb-git-mariadb-5.1.62.tar.gz | |
mysql-5.1.62 mergemariadb-5.1.62
Diffstat (limited to 'storage/innobase/os/os0proc.c')
| -rw-r--r-- | storage/innobase/os/os0proc.c | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/storage/innobase/os/os0proc.c b/storage/innobase/os/os0proc.c index f00475fc528..6092392616f 100644 --- a/storage/innobase/os/os0proc.c +++ b/storage/innobase/os/os0proc.c @@ -532,28 +532,6 @@ os_proc_get_number(void) } /******************************************************************** -Allocates non-cacheable memory. */ - -void* -os_mem_alloc_nocache( -/*=================*/ - /* out: allocated memory */ - ulint n) /* in: number of bytes */ -{ -#ifdef __WIN__ - void* ptr; - - ptr = VirtualAlloc(NULL, n, MEM_COMMIT, - PAGE_READWRITE | PAGE_NOCACHE); - ut_a(ptr); - - return(ptr); -#else - return(ut_malloc(n)); -#endif -} - -/******************************************************************** Allocates large pages memory. */ void* @@ -561,9 +539,6 @@ os_mem_alloc_large( /*===============*/ /* out: allocated memory */ ulint n, /* in: number of bytes */ - ibool set_to_zero, /* in: TRUE if allocated memory - should be set to zero if - UNIV_SET_MEM_TO_ZERO is defined */ ibool assert_on_error)/* in: if TRUE, we crash mysqld if the memory cannot be allocated */ { @@ -602,12 +577,6 @@ os_mem_alloc_large( #endif if (ptr) { - if (set_to_zero) { -#ifdef UNIV_SET_MEM_TO_ZERO - memset(ptr, '\0', size); -#endif - } - return(ptr); } @@ -616,7 +585,7 @@ os_mem_alloc_large( skip: #endif /* HAVE_LARGE_PAGES */ - return(ut_malloc_low(n, set_to_zero, assert_on_error)); + return(ut_malloc_low(n, assert_on_error)); } /******************************************************************** |