diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-16 19:30:39 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-16 19:30:39 +0200 |
| commit | a5b534a08e5c666da6f1e909e24e40f5d6d626c0 (patch) | |
| tree | 401798af6dda2e1952d57c5f91296348bd10293e /storage/xtradb/mem | |
| parent | 005c7e54214546584c8dc67a746e215f8dbe4b58 (diff) | |
| parent | 6bd24f07d4357d32a4bc7208654dc8bd0df30b76 (diff) | |
| download | mariadb-git-a5b534a08e5c666da6f1e909e24e40f5d6d626c0.tar.gz | |
merge Percona-Server-5.5.32-rel31.0.tar.gz
Diffstat (limited to 'storage/xtradb/mem')
| -rw-r--r-- | storage/xtradb/mem/mem0mem.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/storage/xtradb/mem/mem0mem.c b/storage/xtradb/mem/mem0mem.c index 7727760f1cd..797de06c896 100644 --- a/storage/xtradb/mem/mem0mem.c +++ b/storage/xtradb/mem/mem0mem.c @@ -353,7 +353,13 @@ mem_heap_create_block( block = (mem_block_t*) buf_block->frame; } - ut_ad(block); + if(!block) { + ut_print_timestamp(stderr); + fprintf(stderr, + " InnoDB: Unable to allocate memory of size %lu.\n", + len); + ut_error; + } block->buf_block = buf_block; block->free_block = NULL; #else /* !UNIV_HOTBACKUP */ |