diff options
| author | monty@mysql.com <> | 2004-05-20 00:54:52 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-05-20 00:54:52 +0300 |
| commit | a4b0ec1eded00350f41b26c475f45fe4919924c9 (patch) | |
| tree | 969ae655143f6308b50b399e6abcb73c20e39a81 /innobase/mem | |
| parent | 332f124bc62d2a63cfb566b50e2784c357ef6b8e (diff) | |
| parent | 8e2ff7d13546e90eed7e3d05ad7f6a8d047ecdad (diff) | |
| download | mariadb-git-a4b0ec1eded00350f41b26c475f45fe4919924c9.tar.gz | |
Merge with 4.0, mainly to get changes to windows project files
Diffstat (limited to 'innobase/mem')
| -rw-r--r-- | innobase/mem/mem0pool.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/innobase/mem/mem0pool.c b/innobase/mem/mem0pool.c index 7f36b37f734..0227c2d0969 100644 --- a/innobase/mem/mem0pool.c +++ b/innobase/mem/mem0pool.c @@ -97,8 +97,6 @@ struct mem_pool_struct{ /* The common memory pool */ mem_pool_t* mem_comm_pool = NULL; -ulint mem_out_of_mem_err_msg_count = 0; - /* We use this counter to check that the mem pool mutex does not leak; this is to track a strange assertion failure reported at mysql@lists.mysql.com */ @@ -266,8 +264,6 @@ mem_pool_fill_free_list( if (i >= 63) { /* We come here when we have run out of space in the memory pool: */ - - mem_out_of_mem_err_msg_count++; return(FALSE); } @@ -461,17 +457,13 @@ mem_area_free( ulint size; ulint n; - if (mem_out_of_mem_err_msg_count > 0) { - /* It may be that the area was really allocated from the - OS with regular malloc: check if ptr points within - our memory pool */ + /* It may be that the area was really allocated from the OS with + regular malloc: check if ptr points within our memory pool */ - if ((byte*)ptr < pool->buf - || (byte*)ptr >= pool->buf + pool->size) { - ut_free(ptr); + if ((byte*)ptr < pool->buf || (byte*)ptr >= pool->buf + pool->size) { + ut_free(ptr); - return; - } + return; } area = (mem_area_t*) (((byte*)ptr) - MEM_AREA_EXTRA_SIZE); |