mysql/mysql-clone.patch

36 lines
1.6 KiB
Diff

diff --git a/storage/innobase/clone/clone0apply.cc b/storage/innobase/clone/clone0apply.cc
index e41a2e37dbf..742b09d0207 100644
--- a/storage/innobase/clone/clone0apply.cc
+++ b/storage/innobase/clone/clone0apply.cc
@@ -1734,10 +1734,10 @@ int Clone_Snapshot::extend_and_flush_files(bool flush_redo) {
std::string file_name;
file_ctx->get_file_name(file_name);
- auto file =
- os_file_create(innodb_clone_file_key, file_name.c_str(),
- OS_FILE_OPEN | OS_FILE_ON_ERROR_NO_EXIT, OS_FILE_NORMAL,
- OS_CLONE_DATA_FILE, false, &success);
+ auto file = os_file_create(
+ innodb_clone_file_key, file_name.c_str(),
+ OS_FILE_OPEN | OS_FILE_ON_ERROR_NO_EXIT, OS_FILE_NORMAL,
+ flush_redo ? OS_CLONE_LOG_FILE : OS_CLONE_DATA_FILE, false, &success);
if (!success) {
/* purecov: begin inspected */
diff --git a/storage/innobase/include/clone0snapshot.h b/storage/innobase/include/clone0snapshot.h
index 884ac08a884..03a9aa3431c 100644
--- a/storage/innobase/include/clone0snapshot.h
+++ b/storage/innobase/include/clone0snapshot.h
@@ -787,9 +787,9 @@ class Clone_Snapshot {
int init_apply_state(Clone_Desc_State *state_desc);
/** Extend and flush files after copying data
- @param[in] is_redo if true flush redo, otherwise data
+ @param[in] flush_redo if true flush redo, otherwise data
@return error code */
- int extend_and_flush_files(bool is_redo);
+ int extend_and_flush_files(bool flush_redo);
/** Create file descriptor and add to current file list
@param[in] data_dir destination data directory