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 --- mysys/mysys_priv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mysys/mysys_priv.h') diff --git a/mysys/mysys_priv.h b/mysys/mysys_priv.h index aa4af92202a..61b7f2897d4 100644 --- a/mysys/mysys_priv.h +++ b/mysys/mysys_priv.h @@ -73,7 +73,7 @@ extern PSI_file_key key_file_charset, key_file_cnf; void *sf_malloc(size_t size, myf my_flags); void *sf_realloc(void *ptr, size_t size, myf my_flags); void sf_free(void *ptr); -size_t sf_malloc_usable_size(void *ptr, myf *my_flags); +size_t sf_malloc_usable_size(void *ptr, my_bool *is_thread_specific); #else #define sf_malloc(X,Y) malloc(X) #define sf_realloc(X,Y,Z) realloc(X,Y) -- cgit v1.2.1