diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-03-27 01:56:10 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-03-27 01:56:10 +0200 |
| commit | 36b38aa503c05efd0479d73dbb40e5e8f13cb986 (patch) | |
| tree | 6998f99b1790b678ac1558e748e2a8c992bbfa22 /innobase/mem | |
| parent | 6229932f1010c270e2319d8dc3be9670d016546e (diff) | |
| parent | bbedc5ebbf8951c3b6a3d4047c40e7934774d58a (diff) | |
| download | mariadb-git-36b38aa503c05efd0479d73dbb40e5e8f13cb986.tar.gz | |
merge with 3.23.50
BitKeeper/etc/logging_ok:
auto-union
BUILD/SETUP.sh:
Auto merged
Build-tools/Do-compile:
Auto merged
Build-tools/Do-rpm:
Auto merged
configure.in:
Auto merged
include/mysql_com.h:
Auto merged
innobase/btr/btr0btr.c:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
innobase/btr/btr0sea.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/dict/dict0load.c:
Auto merged
innobase/fil/fil0fil.c:
Auto merged
innobase/fsp/fsp0fsp.c:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/include/sync0rw.ic:
Auto merged
innobase/log/log0log.c:
Auto merged
innobase/rem/rem0cmp.c:
Auto merged
innobase/row/row0ins.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/row/row0upd.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysql-test/t/range.test:
Auto merged
scripts/mysqldumpslow.sh:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/lock.cc:
Auto merged
sql/share/Makefile.am:
Auto merged
sql/sql_rename.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
Docs/manual.texi:
merge
client/mysql.cc:
merge
client/mysqldump.c:
merge
innobase/buf/buf0buf.c:
merge
innobase/os/os0file.c:
merge
innobase/row/row0mysql.c:
merge
mysql-test/r/range.result:
merge
sql/ha_innodb.cc:
merge
sql/log_event.h:
merge
sql/mysqld.cc:
merge
sql/sql_base.cc:
merge
sql/sql_load.cc:
merge
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); |