mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 12:32:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Actually invoke free() in ut_allocator::deallocate().

Browse source 
The necessary call was inadvertently commented out in a
merge of MySQL 5.7.14 to MariaDB 10.2.1
(commit fec844aca8).
This commit is contained in:
Marko Mäkelä 2017-01-31 14:12:14 +02:00
parent a5d8dc1818
commit 16bc16f9ba
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
storage/innobase/include/ut0new.h
View file

@ -1,6 +1,7 @@
/*****************************************************************************
Copyright (c) 2014, 2015, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2017, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
@ -389,25 +390,21 @@ public:
}
/** Free a memory allocated by allocate() and trace the deallocation.
@param[in,out] ptr pointer to memory to free
@param[in] n_elements number of elements allocated (unused) */
void
deallocate(
pointer ptr,
size_type n_elements = 0)
@param[in,out] ptr pointer to memory to free */
void deallocate(pointer ptr, size_type)
{
#ifdef UNIV_PFS_MEMORY
if (ptr == NULL) {
return;
}
#ifdef UNIV_PFS_MEMORY
ut_new_pfx_t* pfx = reinterpret_cast<ut_new_pfx_t*>(ptr) - 1;
deallocate_trace(pfx);
free(pfx);
#else
// free(ptr);
free(ptr);
#endif /* UNIV_PFS_MEMORY */
}