diff options
| author | heikki@hundin.mysql.fi <> | 2002-03-21 18:03:09 +0200 |
|---|---|---|
| committer | heikki@hundin.mysql.fi <> | 2002-03-21 18:03:09 +0200 |
| commit | e90a57aa49c79d75cabef38c764b5f81ba0288dc (patch) | |
| tree | 8484c3bb65d40af0743b44a24a788dc2d5cf7d48 /innobase/mem | |
| parent | 254df5fdd66989c404ff2f4253bf05afc2df53fa (diff) | |
| download | mariadb-git-e90a57aa49c79d75cabef38c764b5f81ba0288dc.tar.gz | |
Many files:
Merge InnoDB-3.23.50
Diffstat (limited to 'innobase/mem')
| -rw-r--r-- | innobase/mem/mem0mem.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/innobase/mem/mem0mem.c b/innobase/mem/mem0mem.c index 0680968a7eb..94cf85dfd63 100644 --- a/innobase/mem/mem0mem.c +++ b/innobase/mem/mem0mem.c @@ -234,7 +234,8 @@ mem_heap_add_block( new_size = 2 * mem_block_get_len(block); if (heap->type != MEM_HEAP_DYNAMIC) { - ut_ad(n <= MEM_MAX_ALLOC_IN_BUF); + /* From the buffer pool we allocate buffer frames */ + ut_a(n <= MEM_MAX_ALLOC_IN_BUF); if (new_size > MEM_MAX_ALLOC_IN_BUF) { new_size = MEM_MAX_ALLOC_IN_BUF; @@ -249,7 +250,7 @@ mem_heap_add_block( } new_block = mem_heap_create_block(heap, new_size, NULL, heap->type, - heap->file_name, heap->line); + heap->file_name, heap->line); if (new_block == NULL) { return(NULL); |