diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-07-10 19:55:54 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-07-10 19:55:54 +0200 |
| commit | 172f5e28ba9efceb3d3cee40c8373d2ee66f7c7a (patch) | |
| tree | 2699ed6525a405595de40da2ec5e31793ee63f16 /include/my_dbug.h | |
| parent | 02b8232629807ca3e37b99489f8191c549f7569a (diff) | |
| download | mariadb-git-172f5e28ba9efceb3d3cee40c8373d2ee66f7c7a.tar.gz | |
add safemalloc back
... but differently
client/mysqltest.cc:
my_safe_print_str() don't append \n anymore
dbug/dbug.c:
restore safemalloc as a part of dbug suite
dbug/user.r:
restore 'S' flag documentation
include/my_dbug.h:
restore safemalloc as a part of dbug suite
include/my_sys.h:
move valgrind defines to a dedicated header
mysys/my_malloc.c:
use new safemalloc
mysys/stacktrace.c:
don't append \n. let the calller do it, if needed
sql/mysqld.cc:
my_safe_print_str() don't append \n anymore
Diffstat (limited to 'include/my_dbug.h')
| -rw-r--r-- | include/my_dbug.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/my_dbug.h b/include/my_dbug.h index 6aef3ac1b36..9c81b0cf919 100644 --- a/include/my_dbug.h +++ b/include/my_dbug.h @@ -66,6 +66,9 @@ extern void _db_unlock_file_(void); extern FILE *_db_fp_(void); extern void _db_flush_(); extern const char* _db_get_func_(void); +extern void *_db_malloc_(size_t size); +extern void *_db_realloc_(void *ptr, size_t size); +extern void _db_free_(void *ptr); #define DBUG_ENTER(a) struct _db_stack_frame_ _db_stack_frame_; \ _db_enter_ (a,__FILE__,__LINE__,&_db_stack_frame_) @@ -98,6 +101,10 @@ extern const char* _db_get_func_(void); #define DBUG_EXPLAIN_INITIAL(buf,len) _db_explain_init_((buf),(len)) #define DEBUGGER_OFF do { _dbug_on_= 0; } while(0) #define DEBUGGER_ON do { _dbug_on_= 1; } while(0) +#define DBUG_MALLOC(SIZE) _db_malloc_(SIZE) +#define DBUG_REALLOC(PTR,SIZE) _db_realloc_(PTR,SIZE) +#define DBUG_FREE(PTR) _db_free_(PTR) + #ifndef __WIN__ #define DBUG_ABORT() (_db_flush_(), abort()) #else @@ -163,6 +170,9 @@ extern void _db_suicide_(); #define DBUG_EXPLAIN_INITIAL(buf,len) #define DEBUGGER_OFF do { } while(0) #define DEBUGGER_ON do { } while(0) +#define DBUG_MALLOC(SIZE) malloc(SIZE) +#define DBUG_REALLOC(PTR,SIZE) realloc(PTR,SIZE) +#define DBUG_FREE(PTR) free(PTR) #define DBUG_ABORT() do { } while(0) #define DBUG_CRASH_ENTER(func) #define DBUG_CRASH_RETURN(val) do { return(val); } while(0) |