diff --git a/sql/mysql_install_db.cc b/sql/mysql_install_db.cc
index 61fa17596aa..776762a52ad 100644
--- a/sql/mysql_install_db.cc
+++ b/sql/mysql_install_db.cc
@@ -344,10 +344,29 @@ static char *init_bootstrap_command_line(char *cmdline, size_t size)
 
 static char my_ini_path[MAX_PATH];
 
+/**
+  Wrapper for WritePrivateProfileStringA, with retries and sleeps
+  if file is locked by another process.
+*/
+static BOOL write_private_profile_string_with_retries(const char *appname,
+  const char *key, const char *val, const char *filename)
+{
+  static constexpr int RETRIES=50;
+  static constexpr int SLEEP_MS=10;
+  for (int n= RETRIES;; n--)
+  {
+    if (WritePrivateProfileStringA(appname, key, val, filename))
+      return TRUE;
+    if (GetLastError() != ERROR_ACCESS_DENIED || !n)
+      return FALSE;
+    Sleep(SLEEP_MS);
+  }
+}
+
 static void write_myini_str(const char *key, const char* val, const char *section="mysqld")
 {
   DBUG_ASSERT(my_ini_path[0]);
-  if (!WritePrivateProfileString(section, key, val, my_ini_path))
+  if (!write_private_profile_string_with_retries(section, key, val, my_ini_path))
   {
     die("Can't write to ini file key=%s, val=%s, section=%s, Windows error %u",key,val,section,
       GetLastError());
diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc
index a6379190d4a..c0bb760cea7 100644
--- a/storage/innobase/os/os0file.cc
+++ b/storage/innobase/os/os0file.cc
@@ -2314,8 +2314,20 @@ os_file_rename_func(
 	ut_ad(exists);
 #endif /* UNIV_DEBUG */
 
-	if (MoveFileEx(oldpath, newpath, MOVEFILE_REPLACE_EXISTING)) {
-		return(true);
+	for (int retry= 50;; retry--){
+		if (MoveFileEx(oldpath, newpath, MOVEFILE_REPLACE_EXISTING))
+			return true;
+
+		if (!retry)
+			break;
+
+		if (GetLastError() != ERROR_SHARING_VIOLATION)
+			break;
+
+		// oldpath was opened by someone else (antivirus?)
+		//without FILE_SHARE_DELETE flag. Retry operation
+
+		Sleep(10);
 	}
 
 	os_file_handle_rename_error(oldpath, newpath);