diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2023-03-31 21:32:41 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2023-03-31 21:32:41 +0200 |
| commit | ac5a534a4caa6c86762e721dfe7183be2fee29ca (patch) | |
| tree | a3d40e82beeef165e5965aec282a458b1febf23a /storage/innobase/include | |
| parent | e093e5abbed1a7883b8a78935c11505bd0bcb0d6 (diff) | |
| parent | eaebe8b5600b144c51a9405de42a70bd4b710987 (diff) | |
| download | mariadb-git-ac5a534a4caa6c86762e721dfe7183be2fee29ca.tar.gz | |
Merge remote-tracking branch '10.4' into 10.5
Diffstat (limited to 'storage/innobase/include')
| -rw-r--r-- | storage/innobase/include/os0file.h | 15 | ||||
| -rw-r--r-- | storage/innobase/include/srv0srv.h | 3 |
2 files changed, 11 insertions, 7 deletions
diff --git a/storage/innobase/include/os0file.h b/storage/innobase/include/os0file.h index 572ada33653..a22dc3562b5 100644 --- a/storage/innobase/include/os0file.h +++ b/storage/innobase/include/os0file.h @@ -968,13 +968,14 @@ os_file_flush_func( /** Retrieves the last error number if an error occurs in a file io function. The number should be retrieved before any other OS calls (because they may overwrite the error number). If the number is not known to this program, -the OS error number + 100 is returned. -@param[in] report true if we want an error message printed - for all errors -@return error number, or OS error number + 100 */ -ulint -os_file_get_last_error( - bool report); +the OS error number + OS_FILE_ERROR_MAX is returned. +@param[in] report_all_errors true if we want an error message + printed of all errors +@param[in] on_error_silent true then don't print any diagnostic + to the log +@return error number, or OS error number + OS_FILE_ERROR_MAX */ +ulint os_file_get_last_error(bool report_all_errors, + bool on_error_silent= false); /** NOTE! Use the corresponding macro os_file_read(), not directly this function! diff --git a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h index 077e68e2a16..75718a92a10 100644 --- a/storage/innobase/include/srv0srv.h +++ b/storage/innobase/include/srv0srv.h @@ -387,6 +387,9 @@ extern my_bool srv_immediate_scrub_data_uncompressed; enum srv_operation_mode { /** Normal mode (MariaDB Server) */ SRV_OPERATION_NORMAL, + /** Mariabackup is executing server to export already restored + tablespaces */ + SRV_OPERATION_EXPORT_RESTORED, /** Mariabackup taking a backup */ SRV_OPERATION_BACKUP, /** Mariabackup restoring a backup for subsequent --copy-back */ |