diff options
author | Vasil Dimov <vasil.dimov@oracle.com> | 2010-04-19 20:53:16 +0300 |
---|---|---|
committer | Vasil Dimov <vasil.dimov@oracle.com> | 2010-04-19 20:53:16 +0300 |
commit | c7525a01306e49897c52ea7e9844697f8f8379a1 (patch) | |
tree | 0c1af6979d3c01e38c801d71a2fc74150cc30667 /storage/innobase/mem | |
parent | 49dc3a7b325135c8cd2f93c213a48497d1b57dae (diff) | |
parent | ed30b504d2fd9c14af243248f5a94ae5488ad026 (diff) | |
download | mariadb-git-c7525a01306e49897c52ea7e9844697f8f8379a1.tar.gz |
Merge from innodb-branches-innodb+ (2)
Diffstat (limited to 'storage/innobase/mem')
-rw-r--r-- | storage/innobase/mem/mem0mem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/mem/mem0mem.c b/storage/innobase/mem/mem0mem.c index c0ce8a3e1ac..3e0e31c0891 100644 --- a/storage/innobase/mem/mem0mem.c +++ b/storage/innobase/mem/mem0mem.c @@ -347,7 +347,7 @@ mem_heap_create_block( return(NULL); } } else { - buf_block = buf_block_alloc(0); + buf_block = buf_block_alloc(NULL, 0); } block = (mem_block_t*) buf_block->frame; |