2 files changed, 39 insertions, 1 deletions

diff --git a/innobase/buf/buf0buf.c b/innobase/buf/buf0buf.c
index 9cd4197165c..a447f9692a7 100644
--- a/innobase/buf/buf0buf.c
+++ b/innobase/buf/buf0buf.c
@@ -286,7 +286,7 @@ buf_page_print(
 	ut_print_timestamp(stderr);
 	fprintf(stderr,
 	"  InnoDB: Page dump in ascii and hex (%lu bytes):\n%s",
-					(unsigned long) UNIV_PAGE_SIZE, buf);
+					(ulint)UNIV_PAGE_SIZE, buf);
 	fprintf(stderr, "InnoDB: End of page dump\n");
 
 	mem_free(buf);
diff --git a/innobase/buf/buf0lru.c b/innobase/buf/buf0lru.c
index a2996eefca9..ffdc58f2224 100644
--- a/innobase/buf/buf0lru.c
+++ b/innobase/buf/buf0lru.c
@@ -204,6 +204,44 @@ buf_LRU_get_free_block(void)
 loop:
 	mutex_enter(&(buf_pool->mutex));
 
+	if (UT_LIST_GET_LEN(buf_pool->free)
+	   + UT_LIST_GET_LEN(buf_pool->LRU) < buf_pool->max_size / 10) {
+	   	ut_print_timestamp(stderr);
+
+	   	fprintf(stderr,
+"  InnoDB: ERROR: over 9 / 10 of the buffer pool is occupied by\n"
+"InnoDB: lock heaps or the adaptive hash index!\n"
+"InnoDB: We intentionally generate a seg fault to print a stack trace\n"
+"InnoDB: on Linux!\n");
+
+		ut_a(0);
+	   
+	} else if (UT_LIST_GET_LEN(buf_pool->free)
+	   + UT_LIST_GET_LEN(buf_pool->LRU) < buf_pool->max_size / 5) {
+
+	   	/* 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,
+"  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. Starting InnoDB\n"
+"InnoDB: Monitor to print diagnostics, including lock heap and hash index\n"
+"InnoDB: sizes.\n");
+
+		srv_print_innodb_monitor = TRUE;
+
+	} else if (UT_LIST_GET_LEN(buf_pool->free)
+	   + UT_LIST_GET_LEN(buf_pool->LRU) < buf_pool->max_size / 4) {
+
+		/* Switch off the InnoDB Monitor; this is a simple way
+		to stop the monitor if the situation becomes less urgent,
+		but may also surprise users! */
+
+		srv_print_innodb_monitor = FALSE;
+	}
+
 	if (buf_pool->LRU_flush_ended > 0) {
 		mutex_exit(&(buf_pool->mutex));