diff options
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/innochecksum.cc | 4 | ||||
| -rw-r--r-- | extra/mariabackup/backup_copy.cc | 31 | ||||
| -rw-r--r-- | extra/mariabackup/innobackupex.cc | 2 | ||||
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 2 |
4 files changed, 24 insertions, 15 deletions
diff --git a/extra/innochecksum.cc b/extra/innochecksum.cc index aa591de944e..5e9fe81af8e 100644 --- a/extra/innochecksum.cc +++ b/extra/innochecksum.cc @@ -323,7 +323,7 @@ error_message( /***********************************************//* @param>>_______[in] name>_____name of file. - @retval file pointer; file pointer is NULL when error occured. + @retval file pointer; file pointer is NULL when error occurred. */ FILE* @@ -1119,7 +1119,7 @@ parse_page( /** @param [in/out] file_name name of the filename -@retval FILE pointer if successfully created else NULL when error occured. +@retval FILE pointer if successfully created else NULL when error occurred. */ FILE* create_file( diff --git a/extra/mariabackup/backup_copy.cc b/extra/mariabackup/backup_copy.cc index 176d607fe1c..6a0674bf7f5 100644 --- a/extra/mariabackup/backup_copy.cc +++ b/extra/mariabackup/backup_copy.cc @@ -1665,6 +1665,9 @@ ibx_copy_incremental_over_full() } } + if (!(ret = backup_files_from_datadir(xtrabackup_incremental_dir))) + goto cleanup; + /* copy buffer pool dump */ if (innobase_buffer_pool_filename) { const char *src_name; @@ -2176,20 +2179,26 @@ static bool backup_files_from_datadir(const char *dir_path) if (info.type != OS_FILE_TYPE_FILE) continue; - const char *pname = strrchr(info.name, IF_WIN('\\', '/')); + const char *pname = strrchr(info.name, OS_PATH_SEPARATOR); if (!pname) pname = info.name; - /* Copy aria log files, and aws keys for encryption plugins.*/ - const char *prefixes[] = { "aria_log", "aws-kms-key" }; - for (size_t i = 0; i < array_elements(prefixes); i++) { - if (starts_with(pname, prefixes[i])) { - ret = copy_file(ds_data, info.name, info.name, 1); - if (!ret) { - break; - } - } - } + if (!starts_with(pname, "aws-kms-key") && + !starts_with(pname, "aria_log")) + /* For ES exchange the above line with the following code: + (!xtrabackup_prepare || !xtrabackup_incremental_dir || + !starts_with(pname, "aria_log"))) + */ + continue; + + if (xtrabackup_prepare && xtrabackup_incremental_dir && + file_exists(info.name)) + unlink(info.name); + + std::string full_path(dir_path); + full_path.append(1, OS_PATH_SEPARATOR).append(info.name); + if (!(ret = copy_file(ds_data, full_path.c_str() , info.name, 1))) + break; } os_file_closedir(dir); return ret; diff --git a/extra/mariabackup/innobackupex.cc b/extra/mariabackup/innobackupex.cc index 952d1f4ec63..38b1bcb6f58 100644 --- a/extra/mariabackup/innobackupex.cc +++ b/extra/mariabackup/innobackupex.cc @@ -716,7 +716,7 @@ The --decompress command will decompress a backup made\n\ with the --compress option. The\n\ --parallel option will allow multiple files to be decompressed\n\ simultaneously. In order to decompress, the qpress utility MUST be installed\n\ -and accessable within the path. This process will remove the original\n\ +and accessible within the path. This process will remove the original\n\ compressed files and leave the results in the same location.\n\ \n\ On success the exit code innobackupex is 0. A non-zero exit code \n\ diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 3ddd8786ee9..f2628f2b96b 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -1973,7 +1973,7 @@ static bool innodb_init_param() return false; error: - msg("mariabackup: innodb_init_param(): Error occured.\n"); + msg("mariabackup: innodb_init_param(): Error occurred.\n"); return true; } |