diff options
| author | Jan Lindström <jplindst@mariadb.org> | 2014-03-03 14:27:56 +0200 |
|---|---|---|
| committer | Jan Lindström <jplindst@mariadb.org> | 2014-03-03 14:27:56 +0200 |
| commit | 96100d6652831d6423cc59bb3f065ab7f6f0cf85 (patch) | |
| tree | 3a6c9864c9add695428241931c97899fa7c9a500 /storage/innobase/include/fil0fil.h | |
| parent | b67892cf59872867514709784c54526434784ea9 (diff) | |
| parent | 4b3cf4aa26833206c650be2e40caebf6191d5302 (diff) | |
| download | mariadb-git-96100d6652831d6423cc59bb3f065ab7f6f0cf85.tar.gz | |
Merge: lp:maria/10.0 latest.
Diffstat (limited to 'storage/innobase/include/fil0fil.h')
| -rw-r--r-- | storage/innobase/include/fil0fil.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h index 37bc9ba5c86..71b09f21d67 100644 --- a/storage/innobase/include/fil0fil.h +++ b/storage/innobase/include/fil0fil.h @@ -1,7 +1,7 @@ /***************************************************************************** -Copyright (c) 1995, 2012, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2013, SkySQL Ab. All Rights Reserved. +Copyright (c) 1995, 2013, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 2013, 2014, SkySQL Ab. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -370,9 +370,11 @@ fil_write_flushed_lsn_to_data_files( ulint arch_log_no); /*!< in: latest archived log file number */ /*******************************************************************//** Reads the flushed lsn, arch no, and tablespace flag fields from a data -file at database startup. */ +file at database startup. +@retval NULL on success, or if innodb_force_recovery is set +@return pointer to an error message string */ UNIV_INTERN -void +const char* fil_read_first_page( /*================*/ os_file_t data_file, /*!< in: open data file */ @@ -389,8 +391,9 @@ fil_read_first_page( #endif /* UNIV_LOG_ARCHIVE */ lsn_t* min_flushed_lsn, /*!< out: min of flushed lsn values in data files */ - lsn_t* max_flushed_lsn); /*!< out: max of flushed + lsn_t* max_flushed_lsn) /*!< out: max of flushed lsn values in data files */ + __attribute__((warn_unused_result)); /*******************************************************************//** Increments the count of pending operation, if space is not being deleted. @return TRUE if being deleted, and operation should be skipped */ @@ -738,7 +741,7 @@ fil_io( because i/os are not actually handled until all have been posted: use with great caution! */ - ibool sync, /*!< in: TRUE if synchronous aio is desired */ + bool sync, /*!< in: true if synchronous aio is desired */ ulint space_id, /*!< in: space id */ ulint zip_size, /*!< in: compressed page size in bytes; 0 for uncompressed pages */ @@ -992,8 +995,9 @@ fil_mtr_rename_log( ulint new_space_id, /*!< in: tablespace id of the new table */ const char* new_name, /*!< in: new table name */ - const char* tmp_name) /*!< in: temp table name used while + const char* tmp_name, /*!< in: temp table name used while swapping */ + mtr_t* mtr) /*!< in/out: mini-transaction */ __attribute__((nonnull)); #endif /* !UNIV_INNOCHECKSUM */ |