From c71fad9983b4a3c6e0d9e9eca02dadfd923ddbbb Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 23 Jan 2013 16:20:39 +0100 Subject: 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 --- include/my_sys.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/my_sys.h') 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 */ -- cgit v1.2.1