Commit 59332c86 authored by unknown's avatar unknown
Browse files

InnoDB: Remove unreferenced debug functions from non-debug builds. 


innobase/buf/buf0buf.c:
  Remove buf_print() and buf_validate() unless #ifdef UNIV_DEBUG
innobase/buf/buf0lru.c:
  Remove buf_LRU_print() and buf_LRU_validate() unless #ifdef UNIV_DEBUG
innobase/include/buf0buf.h:
  Remove buf_print() and buf_validate() unless #ifdef UNIV_DEBUG
innobase/include/buf0lru.h:
  Remove buf_LRU_print() and buf_LRU_validate() unless #ifdef UNIV_DEBUG
innobase/include/rem0rec.h:
  rec_offs_comp(): Correct the comment about return value.
parent f6da55d8

innobase/buf/buf0buf.c

+2 −0
Original line number Diff line number Diff line
@@ -1947,6 +1947,7 @@ buf_pool_invalidate(void) 
	mutex_exit(&(buf_pool->mutex));

}



#ifdef UNIV_DEBUG

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

Validates the buffer buf_pool data structure. */
@@ -2146,6 +2147,7 @@ buf_print(void) 


	ut_a(buf_validate());

}	

#endif /* UNIV_DEBUG */



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

Returns the number of latched pages in the buffer pool. */

innobase/buf/buf0lru.c

+3 −1
Original line number Diff line number Diff line
@@ -920,6 +920,7 @@ buf_LRU_block_free_hashed_page( 
	buf_LRU_block_free_non_file_page(block);

}



#ifdef UNIV_DEBUG

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

Validates the LRU list. */
@@ -1050,3 +1051,4 @@ buf_LRU_print(void) 


	mutex_exit(&(buf_pool->mutex));

}

#endif /* UNIV_DEBUG */

innobase/include/buf0buf.h

+8 −6
Original line number Diff line number Diff line
@@ -480,12 +480,20 @@ buf_pool_is_block( 
/*==============*/

			/* out: TRUE if pointer to block */

	void*	ptr);	/* in: pointer to memory */

#ifdef UNIV_DEBUG

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

Validates the buffer pool data structure. */



ibool

buf_validate(void);

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

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

Prints info of the buffer pool data structure. */



void

buf_print(void);

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

#endif /* UNIV_DEBUG */

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

Prints a page to stderr. */
@@ -494,12 +502,6 @@ buf_page_print( 
/*===========*/

	byte*	read_buf);	/* in: a database page */

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

Prints info of the buffer pool data structure. */



void

buf_print(void);

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

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

Returns the number of latched pages in the buffer pool. */



ulint

innobase/include/buf0lru.h

+2 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ void 
buf_LRU_make_block_old(

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

	buf_block_t*	block);	/* in: control block */

#ifdef UNIV_DEBUG

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

Validates the LRU list. */
@@ -134,6 +135,7 @@ Prints the LRU list. */ 
void

buf_LRU_print(void);

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

#endif /* UNIV_DEBUG */



#ifndef UNIV_NONINL

#include "buf0lru.ic"

innobase/include/rem0rec.h

+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ UNIV_INLINE 
ulint

rec_offs_comp(

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

				/* out: TRUE if compact format */

				/* out: nonzero if compact format */

	const ulint*	offsets);/* in: array returned by rec_get_offsets() */

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

Returns nonzero if the extern bit is set in nth field of rec. */