Commit 4f56ed82 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Innodb fixes: 

Added back 'static inline', as not having this caused more problems than having it
Fixed wrong arguments to printf()
parent 6899a4e3

innobase/buf/buf0buf.c

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ buf_page_print( 
	ut_print_timestamp(stderr);

	fprintf(stderr,

	"  InnoDB: Page dump in ascii and hex (%lu bytes):\n%s",

					UNIV_PAGE_SIZE, buf);

					(unsigned long) UNIV_PAGE_SIZE, buf);

	fprintf(stderr, "InnoDB: End of page dump\n");



	mem_free(buf);

innobase/fsp/fsp0fsp.c

+1 −1
Original line number Diff line number Diff line
@@ -2659,7 +2659,7 @@ fseg_free_page_low( 
"InnoDB: Dump of the tablespace extent descriptor: %s\n", errbuf);



		fprintf(stderr,

"InnoDB: Serious error! InnoDB is trying to free page %lu\n",

"InnoDB: Serious error! InnoDB is trying to free page %lu\n"

"InnoDB: though it is already marked as free in the tablespace!\n"

"InnoDB: The tablespace free space info is corrupt.\n"

"InnoDB: You may need to dump your InnoDB tables and recreate the whole\n"

innobase/include/btr0btr.h

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ btr_discard_page( 
	mtr_t*		mtr);	/* in: mtr */

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

Declares the latching order level for the page latch in the debug version. */

UNIV_INLINE



void

btr_declare_page_latch(

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

innobase/include/dyn0dyn.h

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ dyn_block_get_data( 
	dyn_block_t*	block);	/* in: dyn array block */

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

Gets the next block in a dyn array. */

UNIV_INLINE



dyn_block_t*

dyn_block_get_next(

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

innobase/include/univ.i

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ memory is read outside the allocated blocks. */ 
#define UNIV_INLINE  extern inline

#else

/* extern inline doesn't work with gcc 3.0.2 */

#define UNIV_INLINE  inline

#define UNIV_INLINE static inline

#endif

#endif