diff options
author | heikki@hundin.mysql.fi <> | 2004-11-26 00:12:50 +0200 |
---|---|---|
committer | heikki@hundin.mysql.fi <> | 2004-11-26 00:12:50 +0200 |
commit | ccec75f9af0c021e36198714466c300afd58df74 (patch) | |
tree | ca43f3b3618e9b96b7cd998560095502a4e6bade /innobase/mem | |
parent | a3d2aaf99f788059cb70da5c29d046b7321463c5 (diff) | |
download | mariadb-git-ccec75f9af0c021e36198714466c300afd58df74.tar.gz |
Many files:
Fix bug #6817 and bug #6827 : do not crash the server if the buffer pool becomes filled by the locks of ONE huge transaction, return error 1206 instead; do not crash the server, but return error if we cannot allocate memory for the buffer pool at a mysqld startup
Diffstat (limited to 'innobase/mem')
-rw-r--r-- | innobase/mem/mem0pool.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/innobase/mem/mem0pool.c b/innobase/mem/mem0pool.c index 023369e8ec5..cb891a03092 100644 --- a/innobase/mem/mem0pool.c +++ b/innobase/mem/mem0pool.c @@ -199,7 +199,7 @@ mem_pool_create( but only when allocated at a higher level in mem0mem.c. This is to avoid masking useful Purify warnings. */ - pool->buf = ut_malloc_low(size, FALSE); + pool->buf = ut_malloc_low(size, FALSE, TRUE); pool->size = size; mutex_create(&(pool->mutex)); |