set the os_innodb_umask to default value when reset

percona · Jul 29, 2024 · 6ed6532 · 6ed6532
1 parent 5880fef
commit 6ed6532
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/storage/innobase/include/os0file.h b/storage/innobase/include/os0file.h
@@ -1772,7 +1772,7 @@ constexpr mode_t os_innodb_umask_default = std::numeric_limits<mode_t>::max();
 #ifdef XTRABACKUP
 /** We need to allow resetting the umask in case of xtrabackup.
  */
-void os_file_allow_reset_umask();
+void os_file_reset_umask();
 #endif /* XTRABACKUP */
 
 #endif

diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc
@@ -7891,7 +7891,10 @@ void os_file_set_umask(mode_t umask) {
 }
 
 #ifdef XTRABACKUP
-void os_file_allow_reset_umask() { umask_was_already_set = false; }
+void os_file_reset_umask() {
+  umask_was_already_set = false;
+  os_innodb_umask = my_umask;
+}
 #endif /* XTRABACKUP */
 
 #endif

diff --git a/storage/innobase/xtrabackup/src/xtrabackup.cc b/storage/innobase/xtrabackup/src/xtrabackup.cc
@@ -2036,7 +2036,7 @@ static bool innodb_init_param(void) {
     }
   }
 
-  os_file_allow_reset_umask();
+  os_file_reset_umask();
 
   os_file_set_umask((ulint)0664);