diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-11-26 13:44:49 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-11-26 13:44:49 +0000 |
| commit | 42af43e37542d27b8b53677174642c4d4326778e (patch) | |
| tree | c7ac4c11ee0cfec1ed32d3fecc46d396019403e3 /innobase/buf/buf0buf.c | |
| parent | 8d97c013664e878490f65f0158fb978a24451e60 (diff) | |
| parent | b0d586e5648e78981c63e68059c6c836a228a082 (diff) | |
| download | mariadb-git-42af43e37542d27b8b53677174642c4d4326778e.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
innobase/buf/buf0buf.c:
Auto merged
innobase/buf/buf0lru.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
Auto merged
sql/sql_repl.cc:
Auto merged
Diffstat (limited to 'innobase/buf/buf0buf.c')
| -rw-r--r-- | innobase/buf/buf0buf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/innobase/buf/buf0buf.c b/innobase/buf/buf0buf.c index d686b559528..2f8ce7507ba 100644 --- a/innobase/buf/buf0buf.c +++ b/innobase/buf/buf0buf.c @@ -548,8 +548,9 @@ buf_pool_init( } /*----------------------------------------*/ } else { - buf_pool->frame_mem = ut_malloc( - UNIV_PAGE_SIZE * (n_frames + 1)); + buf_pool->frame_mem = ut_malloc_low( + UNIV_PAGE_SIZE * (n_frames + 1), + TRUE, FALSE); } if (buf_pool->frame_mem == NULL) { |