mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 11:57:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge from innodb-branches-innodb+ (2)

Browse source
This commit is contained in:
Vasil Dimov 2010-04-19 20:53:16 +03:00
commit c7525a0130
39 changed files with 2827 additions and 1408 deletions
Download patch file Download diff file Expand all files Collapse all files

2
storage/innobase/mem/mem0mem.c
View file

@ -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;