Commit 042facc4 authored by heikki@hundin.mysql.fi's avatar heikki@hundin.mysql.fi
Browse files

Many files: 

  Merge InnoDB-3.23.52d
parent 5fadf192

innobase/btr/btr0sea.c

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ Created 2/17/1996 Heikki Tuuri 
#include "btr0cur.h"

#include "btr0pcur.h"

#include "btr0btr.h"

#include "ha0ha.h"



ulint	btr_search_n_succ	= 0;

ulint	btr_search_n_hash_fail	= 0;

innobase/buf/buf0buf.c

+16 −2
Original line number Diff line number Diff line
@@ -1844,8 +1844,8 @@ buf_print_io( 
		buf_pool->n_flush[BUF_FLUSH_SINGLE_PAGE]);



	current_time = time(NULL);

	time_elapsed = difftime(current_time, buf_pool->last_printout_time);



	time_elapsed = 0.001 + difftime(current_time,

						buf_pool->last_printout_time);

	buf_pool->last_printout_time = current_time;



	buf += sprintf(buf, "Pages read %lu, created %lu, written %lu\n",
@@ -1878,6 +1878,20 @@ buf_print_io( 
	mutex_exit(&(buf_pool->mutex));

}



/**************************************************************************

Refreshes the statistics used to print per-second averages. */



void

buf_refresh_io_stats(void)

/*======================*/

{

        buf_pool->last_printout_time = time(NULL);

	buf_pool->n_page_gets_old = buf_pool->n_page_gets;

	buf_pool->n_pages_read_old = buf_pool->n_pages_read;

	buf_pool->n_pages_created_old = buf_pool->n_pages_created;

	buf_pool->n_pages_written_old = buf_pool->n_pages_written;

}



/*************************************************************************

Checks that all file pages in the buffer are in a replaceable state. */

innobase/buf/buf0lru.c

+4 −3
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ Created 11/5/1995 Heikki Tuuri 
#include "buf0rea.h"

#include "btr0sea.h"

#include "os0file.h"

#include "log0recv.h"



/* The number of blocks from the LRU_old pointer onward, including the block

pointed to, must be 3/8 of the whole LRU list length, except that the
@@ -204,7 +205,7 @@ buf_LRU_get_free_block(void) 
loop:

	mutex_enter(&(buf_pool->mutex));



	if (UT_LIST_GET_LEN(buf_pool->free)

	if (!recv_recovery_on && UT_LIST_GET_LEN(buf_pool->free)

	   + UT_LIST_GET_LEN(buf_pool->LRU) < buf_pool->max_size / 10) {

	   	ut_print_timestamp(stderr);
@@ -216,7 +217,7 @@ buf_LRU_get_free_block(void) 


		ut_a(0);

	   

	} else if (UT_LIST_GET_LEN(buf_pool->free)

	} else if (!recv_recovery_on && 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
@@ -232,7 +233,7 @@ buf_LRU_get_free_block(void) 


		srv_print_innodb_monitor = TRUE;



	} else if (UT_LIST_GET_LEN(buf_pool->free)

	} else if (!recv_recovery_on && 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

innobase/configure.in

+2 −0
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ else 
fi



case "$target_os" in

       hpux10*)

	 CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE -DUNIV_HPUX -DUNIV_HPUX10";;

       hp*)

	 CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE -DUNIV_HPUX";;

       irix*)

innobase/include/buf0buf.h

+6 −0
Original line number Diff line number Diff line
@@ -463,6 +463,12 @@ buf_print_io( 
/*=========*/

	char*	buf,	/* in/out: buffer where to print */

	char*	buf_end);/* in: buffer end */

/**************************************************************************

Refreshes the statistics used to print per-second averages. */



void

buf_refresh_io_stats(void);

/*======================*/

/*************************************************************************

Checks that all file pages in the buffer are in a replaceable state. */