summaryrefslogtreecommitdiff
path: root/innobase/include/mem0mem.ic
diff options
context:
space:
mode:
authorheikki@hundin.mysql.fi <>2002-12-22 01:54:29 +0200
committerheikki@hundin.mysql.fi <>2002-12-22 01:54:29 +0200
commit843e1d8e9c6bff2b25a2ac8c367f9d7fcbc528cc (patch)
tree120402316f5b15cb879b72bdb1c4cf59c8d932cb /innobase/include/mem0mem.ic
parentf03bbd3fe28455885603890a21eebfe2792f2704 (diff)
downloadmariadb-git-843e1d8e9c6bff2b25a2ac8c367f9d7fcbc528cc.tar.gz
Many files:
Merge InnoDB-4.0.7. Support for ON UPDATE CASCADE sql_select.cc: Remove superfluous prints to .err log when a locking SELECT fails to a deadlock or a lock wait timeout
Diffstat (limited to 'innobase/include/mem0mem.ic')
-rw-r--r--innobase/include/mem0mem.ic7
1 files changed, 4 insertions, 3 deletions
diff --git a/innobase/include/mem0mem.ic b/innobase/include/mem0mem.ic
index a7abb93d91d..1ff8c66e80a 100644
--- a/innobase/include/mem0mem.ic
+++ b/innobase/include/mem0mem.ic
@@ -440,9 +440,10 @@ 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 */
- )
+ char* file_name __attribute__((unused)),
+ /* in: file name where freed */
+ ulint line __attribute__((unused)))
+ /* in: line where freed */
{
mem_block_t* block;
mem_block_t* prev_block;