database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

perfschema memory related instrumentation changes

Browse Source
This commit is contained in:
Sergei Golubchik
2020-01-29 13:50:26 +01:00
parent 2ac3121af2
commit 7c58e97bf6
307 changed files with 2622 additions and 1743 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sql/sql_join_cache.cc
View File

@ -937,7 +937,8 @@ int JOIN_CACHE::alloc_buffer()
{
size_t next_buff_size;
if ((buff= (uchar*) my_malloc(buff_size, MYF(MY_THREAD_SPECIFIC))))
if ((buff= (uchar*) my_malloc(key_memory_JOIN_CACHE, buff_size,
MYF(MY_THREAD_SPECIFIC))))
break;
next_buff_size= buff_size > buff_size_decr ? buff_size-buff_size_decr : 0;
@ -1013,11 +1014,11 @@ bool JOIN_CACHE::shrink_join_buffer_in_ratio(ulonglong n, ulonglong d)
int JOIN_CACHE::realloc_buffer()
{
int rc;
free();
rc= MY_TEST(!(buff= (uchar*) my_malloc(buff_size, MYF(MY_THREAD_SPECIFIC))));
buff= (uchar*) my_malloc(key_memory_JOIN_CACHE, buff_size,
MYF(MY_THREAD_SPECIFIC));
reset(TRUE);
return rc;
return buff == NULL;
}
@ -2809,12 +2810,12 @@ int JOIN_CACHE_HASHED::init_hash_table()
int JOIN_CACHE_HASHED::realloc_buffer()
{
int rc;
free();
rc= MY_TEST(!(buff= (uchar*) my_malloc(buff_size, MYF(MY_THREAD_SPECIFIC))));
buff= (uchar*) my_malloc(key_memory_JOIN_CACHE, buff_size,
MYF(MY_THREAD_SPECIFIC));
init_hash_table();
reset(TRUE);
return rc;
return buff == NULL;
}