diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-04 15:40:55 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-04 15:40:55 +0200 |
| commit | 8ce6c9fc6c3091c43ab91980fe904ed5125ba597 (patch) | |
| tree | 49da2620373e1b4c73d505405819d5d7097786bc /innobase/include/mem0mem.h | |
| parent | f67891c24422a223a50a2477883e587c520057ad (diff) | |
| parent | e229fe9801cc9fb7e3783cf708bc7cb695606c64 (diff) | |
| download | mariadb-git-8ce6c9fc6c3091c43ab91980fe904ed5125ba597.tar.gz | |
merge
BitKeeper/etc/logging_ok:
auto-union
include/mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/multi_update.result:
Auto merged
mysql-test/t/multi_update.test:
Auto merged
mysys/Makefile.am:
Auto merged
sql/field.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/italian/errmsg.txt:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'innobase/include/mem0mem.h')
| -rw-r--r-- | innobase/include/mem0mem.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/innobase/include/mem0mem.h b/innobase/include/mem0mem.h index bfd25f5bdbe..9ab3b2cd754 100644 --- a/innobase/include/mem0mem.h +++ b/innobase/include/mem0mem.h @@ -127,16 +127,18 @@ mem_heap_create_func( ulint line /* in: line where created */ ); /********************************************************************* -NOTE: Use the corresponding macro instead of this function. -Frees the space occupied by a memory heap. */ +NOTE: Use the corresponding macro instead of this function. Frees the space +occupied by a memory heap. In the debug version erases the heap memory +blocks. */ UNIV_INLINE void mem_heap_free_func( /*===============*/ - mem_heap_t* heap, /* in, own: heap to be freed */ - char* file_name, /* in: file name where freed */ - ulint line /* in: line where freed */ -); + mem_heap_t* heap, /* in, own: heap to be freed */ + char* file_name __attribute__((unused)), + /* in: file name where freed */ + ulint line __attribute__((unused))); + /* in: line where freed */ /******************************************************************* Allocates n bytes of memory from a memory heap. */ UNIV_INLINE |