diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2011-01-25 10:51:13 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2011-01-25 10:51:13 +0200 |
| commit | 41375b0fa48c3879ee7ecaa5cca0fe8f0fe5fe2e (patch) | |
| tree | 732af417c0e2ad7de8af272b0d261daa6b5f091f /storage/innobase/mem | |
| parent | 7f7e934f23cde651a0bc6575958e163d08806cfe (diff) | |
| parent | 60a622d1c1940f80829a4df312ff49a6feae265e (diff) | |
| download | mariadb-git-41375b0fa48c3879ee7ecaa5cca0fe8f0fe5fe2e.tar.gz | |
Merge mysql-5.1-innodb to mysql-5.5-innodb.
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 b5a7ddbd7b2..7727760f1cd 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(NULL, 0); + buf_block = buf_block_alloc(NULL); } block = (mem_block_t*) buf_block->frame; |