diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-10-19 20:38:59 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-10-19 20:38:59 +0200 |
| commit | e1f681c99b3e5462c033aaafa94ac295e626cde2 (patch) | |
| tree | 2da5eff1a0d03831c2d85b32a7bc3df6ec37b522 /storage/xtradb/buf/buf0buf.c | |
| parent | 52c84d144d3b07966d9b3bab8694eb012eef69ce (diff) | |
| parent | 807fef40fffbbb8e92564a52b902b504ba8cfcdc (diff) | |
| download | mariadb-git-e1f681c99b3e5462c033aaafa94ac295e626cde2.tar.gz | |
10.0-base -> 10.0-monty
Diffstat (limited to 'storage/xtradb/buf/buf0buf.c')
| -rw-r--r-- | storage/xtradb/buf/buf0buf.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/storage/xtradb/buf/buf0buf.c b/storage/xtradb/buf/buf0buf.c index fd7b8959473..a2ff171e0c5 100644 --- a/storage/xtradb/buf/buf0buf.c +++ b/storage/xtradb/buf/buf0buf.c @@ -344,7 +344,6 @@ be effective only if PFS_GROUP_BUFFER_SYNC is defined. */ // was allocated for the frames */ // buf_block_t* blocks; /*!< array of buffer control blocks */ //}; -#endif /* !UNIV_HOTBACKUP */ /********************************************************************//** Gets the smallest oldest_modification lsn for any page in the pool. Returns @@ -482,6 +481,7 @@ buf_block_alloc( return(block); } +#endif /* !UNIV_HOTBACKUP */ /********************************************************************//** Calculates a page checksum which is stored to the page when it is written @@ -3907,9 +3907,10 @@ buf_mark_space_corrupt( /********************************************************************//** Completes an asynchronous read or write request of a file page to or from -the buffer pool. */ +the buffer pool. +@return TRUE if successful */ UNIV_INTERN -void +ibool buf_page_io_complete( /*=================*/ buf_page_t* bpage) /*!< in: pointer to the block in question */ @@ -4057,7 +4058,7 @@ corrupt: table as corrupted instead of crashing server */ if (bpage->space > TRX_SYS_SPACE && buf_mark_space_corrupt(bpage)) { - return; + return(FALSE); } else { fputs("InnoDB: Ending processing" " because of" @@ -4176,6 +4177,8 @@ retry_mutex: buf_pool_mutex_exit(buf_pool); mutex_exit(block_mutex); + + return(TRUE); } /********************************************************************//** |