diff options
| author | unknown <heikki@hundin.mysql.fi> | 2002-03-21 18:03:09 +0200 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2002-03-21 18:03:09 +0200 |
| commit | d3c0752b6aec6afef1f0dba85c9a0f1237843e6d (patch) | |
| tree | 8484c3bb65d40af0743b44a24a788dc2d5cf7d48 /innobase/mem | |
| parent | 838c6427b278a016f968338468761dabcfecba29 (diff) | |
| download | mariadb-git-d3c0752b6aec6afef1f0dba85c9a0f1237843e6d.tar.gz | |
Many files:
Merge InnoDB-3.23.50
innobase/btr/btr0btr.c:
Merge InnoDB-3.23.50
innobase/btr/btr0cur.c:
Merge InnoDB-3.23.50
innobase/btr/btr0sea.c:
Merge InnoDB-3.23.50
innobase/buf/buf0buf.c:
Merge InnoDB-3.23.50
innobase/buf/buf0flu.c:
Merge InnoDB-3.23.50
innobase/dict/dict0dict.c:
Merge InnoDB-3.23.50
innobase/dict/dict0load.c:
Merge InnoDB-3.23.50
innobase/fil/fil0fil.c:
Merge InnoDB-3.23.50
innobase/fsp/fsp0fsp.c:
Merge InnoDB-3.23.50
innobase/include/buf0flu.h:
Merge InnoDB-3.23.50
innobase/include/dict0dict.h:
Merge InnoDB-3.23.50
innobase/include/fil0fil.h:
Merge InnoDB-3.23.50
innobase/include/fsp0fsp.h:
Merge InnoDB-3.23.50
innobase/include/log0log.h:
Merge InnoDB-3.23.50
innobase/include/log0recv.h:
Merge InnoDB-3.23.50
innobase/include/mem0mem.h:
Merge InnoDB-3.23.50
innobase/include/os0file.h:
Merge InnoDB-3.23.50
innobase/include/row0mysql.h:
Merge InnoDB-3.23.50
innobase/include/srv0srv.h:
Merge InnoDB-3.23.50
innobase/include/srv0start.h:
Merge InnoDB-3.23.50
innobase/include/trx0sys.h:
Merge InnoDB-3.23.50
innobase/include/ut0byte.h:
Merge InnoDB-3.23.50
innobase/include/ut0rnd.h:
Merge InnoDB-3.23.50
innobase/include/ut0ut.h:
Merge InnoDB-3.23.50
innobase/log/log0log.c:
Merge InnoDB-3.23.50
innobase/log/log0recv.c:
Merge InnoDB-3.23.50
innobase/mem/mem0mem.c:
Merge InnoDB-3.23.50
innobase/os/os0file.c:
Merge InnoDB-3.23.50
innobase/rem/rem0cmp.c:
Merge InnoDB-3.23.50
innobase/row/row0ins.c:
Merge InnoDB-3.23.50
innobase/row/row0mysql.c:
Merge InnoDB-3.23.50
innobase/row/row0sel.c:
Merge InnoDB-3.23.50
innobase/row/row0upd.c:
Merge InnoDB-3.23.50
innobase/srv/srv0srv.c:
Merge InnoDB-3.23.50
innobase/srv/srv0start.c:
Merge InnoDB-3.23.50
innobase/trx/trx0sys.c:
Merge InnoDB-3.23.50
innobase/ut/ut0mem.c:
Merge InnoDB-3.23.50
innobase/ut/ut0ut.c:
Merge InnoDB-3.23.50
sql/ha_innobase.cc:
Merge InnoDB-3.23.50
sql/ha_innobase.h:
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); |