diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-08-01 00:37:27 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-08-01 00:37:27 +0300 |
| commit | dd764d999ee270d3e3ad5e14881b7b16c247d762 (patch) | |
| tree | d3cae6fb9d21760c7c3ac7f5c98c5c3b5c605b76 | |
| parent | e2cf3f8e4501befbae0f785a422cb832fb3466c2 (diff) | |
| download | mariadb-git-dd764d999ee270d3e3ad5e14881b7b16c247d762.tar.gz | |
Innodb fixes:
Added back 'static inline', as not having this caused more problems than having it
Fixed wrong arguments to printf()
innobase/buf/buf0buf.c:
Fixed wrong argument to printf()
innobase/fsp/fsp0fsp.c:
Fixed wrong argument to printf()
innobase/include/btr0btr.h:
Removed UNIV_INLINE for functions that should not be inlined
innobase/include/dyn0dyn.h:
Removed UNIV_INLINE for functions that should not be inlined
innobase/include/univ.i:
Added back 'static inline', as not having this caused more problems than having it
| -rw-r--r-- | innobase/buf/buf0buf.c | 2 | ||||
| -rw-r--r-- | innobase/fsp/fsp0fsp.c | 2 | ||||
| -rw-r--r-- | innobase/include/btr0btr.h | 2 | ||||
| -rw-r--r-- | innobase/include/dyn0dyn.h | 2 | ||||
| -rw-r--r-- | innobase/include/univ.i | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/innobase/buf/buf0buf.c b/innobase/buf/buf0buf.c index e3a4ae50a23..9cd4197165c 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", - UNIV_PAGE_SIZE, buf); + (unsigned long) UNIV_PAGE_SIZE, buf); fprintf(stderr, "InnoDB: End of page dump\n"); mem_free(buf); diff --git a/innobase/fsp/fsp0fsp.c b/innobase/fsp/fsp0fsp.c index 679af640b99..10370731edf 100644 --- a/innobase/fsp/fsp0fsp.c +++ b/innobase/fsp/fsp0fsp.c @@ -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" diff --git a/innobase/include/btr0btr.h b/innobase/include/btr0btr.h index bf433c0c264..1b48eaeb4b2 100644 --- a/innobase/include/btr0btr.h +++ b/innobase/include/btr0btr.h @@ -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( /*===================*/ diff --git a/innobase/include/dyn0dyn.h b/innobase/include/dyn0dyn.h index 504aade29d2..49a1a4c6129 100644 --- a/innobase/include/dyn0dyn.h +++ b/innobase/include/dyn0dyn.h @@ -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( /*===============*/ diff --git a/innobase/include/univ.i b/innobase/include/univ.i index 8a9637acfda..15a6115c37e 100644 --- a/innobase/include/univ.i +++ b/innobase/include/univ.i @@ -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 |