diff options
| author | monty@mysql.com <> | 2004-02-11 00:06:46 +0100 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-02-11 00:06:46 +0100 |
| commit | ce145789092b294a562f565671478ae2bf51d14a (patch) | |
| tree | 927515d304bd661aebdb0e534418caf49d322ada /innobase/buf | |
| parent | 0c6a0b9a3118948efeedefd036d2994982babd08 (diff) | |
| parent | efb134f3a874befe4ab1779f597ada09f57ca191 (diff) | |
| download | mariadb-git-ce145789092b294a562f565671478ae2bf51d14a.tar.gz | |
Merge with 4.0.18
Diffstat (limited to 'innobase/buf')
| -rw-r--r-- | innobase/buf/buf0lru.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/innobase/buf/buf0lru.c b/innobase/buf/buf0lru.c index 23f399503c8..db876c416cc 100644 --- a/innobase/buf/buf0lru.c +++ b/innobase/buf/buf0lru.c @@ -299,7 +299,7 @@ buf_LRU_get_free_block(void) buf_block_t* block = NULL; ibool freed; ulint n_iterations = 1; - ibool mon_value_was = 0; /* remove bug */ + ibool mon_value_was = FALSE; ibool started_monitor = FALSE; loop: mutex_enter(&(buf_pool->mutex)); @@ -318,12 +318,14 @@ loop: } else if (!recv_recovery_on && UT_LIST_GET_LEN(buf_pool->free) + UT_LIST_GET_LEN(buf_pool->LRU) < buf_pool->max_size / 5) { + if (!srv_print_innodb_monitor) { - /* Over 80 % of the buffer pool is occupied by lock heaps - or the adaptive hash index. This may be a memory leak! */ + /* Over 80 % of the buffer pool is occupied by lock + heaps or the adaptive hash index. This may be a memory + leak! */ - ut_print_timestamp(stderr); - fprintf(stderr, + ut_print_timestamp(stderr); + fprintf(stderr, " InnoDB: WARNING: over 4 / 5 of the buffer pool is occupied by\n" "InnoDB: lock heaps or the adaptive hash index! Check that your\n" "InnoDB: transactions do not set too many row locks.\n" @@ -333,8 +335,9 @@ loop: "InnoDB: lock heap and hash index sizes.\n", (ulong) (buf_pool->curr_size / (1024 * 1024 / UNIV_PAGE_SIZE))); - srv_print_innodb_monitor = TRUE; - + srv_print_innodb_monitor = TRUE; + os_event_set(srv_lock_timeout_thread_event); + } } else if (!recv_recovery_on && UT_LIST_GET_LEN(buf_pool->free) + UT_LIST_GET_LEN(buf_pool->LRU) < buf_pool->max_size / 4) { @@ -423,6 +426,7 @@ loop: mon_value_was = srv_print_innodb_monitor; started_monitor = TRUE; srv_print_innodb_monitor = TRUE; + os_event_set(srv_lock_timeout_thread_event); } /* No free block was found: try to flush the LRU list */ |