diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-06-06 11:04:17 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-06-06 11:04:17 +0300 |
| commit | 1d4e1d3263bf3b87b473c12d4876f368dc3450b6 (patch) | |
| tree | d0caf15cd3d42ff05831fc25dda7bc5856465391 /storage/xtradb/os | |
| parent | 3b7da8a44c8a0ff4b40b37e4db01f7e397aefab5 (diff) | |
| parent | 55abcfa7b70968246a1a26a8839013ebb8f5c506 (diff) | |
| download | mariadb-git-1d4e1d3263bf3b87b473c12d4876f368dc3450b6.tar.gz | |
Merge 10.0 to 10.1
Diffstat (limited to 'storage/xtradb/os')
| -rw-r--r-- | storage/xtradb/os/os0file.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/storage/xtradb/os/os0file.cc b/storage/xtradb/os/os0file.cc index 6a63f31b37a..da8548f0fa8 100644 --- a/storage/xtradb/os/os0file.cc +++ b/storage/xtradb/os/os0file.cc @@ -1437,7 +1437,8 @@ os_file_create_simple_func( /* Use default security attributes and no template file. */ file = CreateFile( - (LPCTSTR) name, access, FILE_SHARE_READ, NULL, + (LPCTSTR) name, access, + FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, create_flag, attributes, NULL); if (file == INVALID_HANDLE_VALUE) { @@ -1603,7 +1604,7 @@ os_file_create_simple_no_error_handling_func( DWORD access; DWORD create_flag; DWORD attributes = 0; - DWORD share_mode = FILE_SHARE_READ; + DWORD share_mode = FILE_SHARE_READ | FILE_SHARE_DELETE; ut_a(name); ut_a(!(create_mode & OS_FILE_ON_ERROR_SILENT)); @@ -1925,7 +1926,7 @@ os_file_create_func( #ifdef __WIN__ DWORD create_flag; - DWORD share_mode = FILE_SHARE_READ; + DWORD share_mode = FILE_SHARE_READ | FILE_SHARE_DELETE; on_error_no_exit = create_mode & OS_FILE_ON_ERROR_NO_EXIT ? TRUE : FALSE; |