diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-01-23 16:20:39 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-23 16:20:39 +0100 |
| commit | c71fad9983b4a3c6e0d9e9eca02dadfd923ddbbb (patch) | |
| tree | 76dbef3d7d96a3692039779f20f48938c260a5f1 /include/my_sys.h | |
| parent | 52051882002c1b88a427d50fb343a9ed3614ffe0 (diff) | |
| download | mariadb-git-c71fad9983b4a3c6e0d9e9eca02dadfd923ddbbb.tar.gz | |
cleanup:
* don't use 'myf flags', when 'my_bool is_thread_specific' is meant
* call set_malloc_size_cb() for embedded too
* warn in safemalloc if the memory is freed by a wrong thread
sql/mysqld.cc:
move set_malloc_size_cb() to a function that is also called for embedded
sql/mysqld.h:
gdb-friendly, one can put breakpoint on a function, but not on a macro
sql/sql_class.cc:
initialize thread_id earlier
Diffstat (limited to 'include/my_sys.h')
| -rw-r--r-- | include/my_sys.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 62e194157eb..13e4d463515 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -161,7 +161,7 @@ extern my_thread_id (*sf_malloc_dbug_id)(void); #define SAFEMALLOC_REPORT_MEMORY(X) do {} while(0) #endif -typedef void (*MALLOC_SIZE_CB) (long long size, myf my_flags); +typedef void (*MALLOC_SIZE_CB) (long long size, my_bool is_thread_specific); extern void set_malloc_size_cb(MALLOC_SIZE_CB func); /* defines when allocating data */ |