database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Innodb fixes:

Browse Source 
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
This commit is contained in:
unknown
2002-08-01 00:37:27 +03:00
parent e2cf3f8e45
commit dd764d999e
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
innobase/buf/buf0buf.c
View File

@ -286,7 +286,7 @@ buf_page_print(
ut_print_timestamp(stderr); ut_print_timestamp(stderr);
fprintf(stderr, fprintf(stderr,
" InnoDB: Page dump in ascii and hex (%lu bytes):\n%s", " 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"); fprintf(stderr, "InnoDB: End of page dump\n");
mem_free(buf); mem_free(buf);

2
innobase/fsp/fsp0fsp.c
View File

@ -2659,7 +2659,7 @@ fseg_free_page_low(
"InnoDB: Dump of the tablespace extent descriptor: %s\n", errbuf); "InnoDB: Dump of the tablespace extent descriptor: %s\n", errbuf);
fprintf(stderr, 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: though it is already marked as free in the tablespace!\n"
"InnoDB: The tablespace free space info is corrupt.\n" "InnoDB: The tablespace free space info is corrupt.\n"
"InnoDB: You may need to dump your InnoDB tables and recreate the whole\n" "InnoDB: You may need to dump your InnoDB tables and recreate the whole\n"

2
innobase/include/btr0btr.h
View File

@ -315,7 +315,7 @@ btr_discard_page(
mtr_t* mtr); /* in: mtr */ mtr_t* mtr); /* in: mtr */
/************************************************************************ /************************************************************************
Declares the latching order level for the page latch in the debug version. */ Declares the latching order level for the page latch in the debug version. */
UNIV_INLINE
void void
btr_declare_page_latch( btr_declare_page_latch(
/*===================*/ /*===================*/

2
innobase/include/dyn0dyn.h
View File

@ -127,7 +127,7 @@ dyn_block_get_data(
dyn_block_t* block); /* in: dyn array block */ dyn_block_t* block); /* in: dyn array block */
/************************************************************************ /************************************************************************
Gets the next block in a dyn array. */ Gets the next block in a dyn array. */
UNIV_INLINE
dyn_block_t* dyn_block_t*
dyn_block_get_next( dyn_block_get_next(
/*===============*/ /*===============*/

2
innobase/include/univ.i
View File

@ -116,7 +116,7 @@ memory is read outside the allocated blocks. */
#define UNIV_INLINE extern inline #define UNIV_INLINE extern inline
#else #else
/* extern inline doesn't work with gcc 3.0.2 */ /* extern inline doesn't work with gcc 3.0.2 */
#define UNIV_INLINE inline #define UNIV_INLINE static inline
#endif #endif
#endif #endif