Commit c97ae6b5 authored by Jan Lindström's avatar Jan Lindström

MDEV-4923 Incorrect merge on XtraDB os0file.c. Function...

MDEV-4923 Incorrect merge on XtraDB os0file.c. Function os_file_set_atomic_writes returns TRUE when successfull and FALSE at failure.
parent 84a2fb48
...@@ -1659,7 +1659,7 @@ try_again: ...@@ -1659,7 +1659,7 @@ try_again:
} }
if (srv_use_atomic_writes && type == OS_DATA_FILE && if (srv_use_atomic_writes && type == OS_DATA_FILE &&
os_file_set_atomic_writes(file, name)) { !os_file_set_atomic_writes(file, name)) {
CloseHandle(file); CloseHandle(file);
*success = FALSE; *success = FALSE;
file = INVALID_HANDLE_VALUE; file = INVALID_HANDLE_VALUE;
...@@ -1786,7 +1786,7 @@ try_again: ...@@ -1786,7 +1786,7 @@ try_again:
#endif /* USE_FILE_LOCK */ #endif /* USE_FILE_LOCK */
if (srv_use_atomic_writes && type == OS_DATA_FILE if (srv_use_atomic_writes && type == OS_DATA_FILE
&& os_file_set_atomic_writes(name, file)) { && !os_file_set_atomic_writes(name, file)) {
*success = FALSE; *success = FALSE;
close(file); close(file);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment