diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-17 12:33:31 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-01-17 12:38:46 +0200 |
| commit | 77cbaa96ad9a6077d271bf97b0c0dc8cdf5b5991 (patch) | |
| tree | ba8d2c87f8d15d064657315f48ccb58aa117b95a /storage/innobase/os | |
| parent | 62a0224666fd0b2790837288cafde009f02e2b52 (diff) | |
| parent | 8e80fd6bfdf2ea7d1870662ecd4d8129f3c76301 (diff) | |
| download | mariadb-git-77cbaa96ad9a6077d271bf97b0c0dc8cdf5b5991.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/os')
| -rw-r--r-- | storage/innobase/os/os0proc.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/storage/innobase/os/os0proc.cc b/storage/innobase/os/os0proc.cc index 1a6da03a402..0c8f8795be8 100644 --- a/storage/innobase/os/os0proc.cc +++ b/storage/innobase/os/os0proc.cc @@ -165,7 +165,6 @@ os_mem_free_large( if (os_use_large_pages && os_large_page_size && !shmdt(ptr)) { my_atomic_addlint( &os_total_large_mem_allocated, -size); - UNIV_MEM_FREE(ptr, size); return; } #endif /* HAVE_LINUX_LARGE_PAGES && UNIV_LINUX */ @@ -178,7 +177,6 @@ os_mem_free_large( } else { my_atomic_addlint( &os_total_large_mem_allocated, -lint(size)); - UNIV_MEM_FREE(ptr, size); } #elif !defined OS_MAP_ANON ut_free(ptr); @@ -193,7 +191,6 @@ os_mem_free_large( } else { my_atomic_addlint( &os_total_large_mem_allocated, -size); - UNIV_MEM_FREE(ptr, size); } #endif } |