diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-09-16 09:44:52 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-09-16 09:45:38 +0000 |
| commit | 1d7bc3b58263153d18198a6bde03b2b2b6519a77 (patch) | |
| tree | 041cc5b98f97b0824beb8bf098c79be29745b5a7 | |
| parent | ad17e8e518c85a156d05f091874dd5c2ddfafa32 (diff) | |
| download | mariadb-git-1d7bc3b58263153d18198a6bde03b2b2b6519a77.tar.gz | |
Innodb : do not call fflush() in os_get_last_error_low(), if no error
message was written.
| -rw-r--r-- | storage/innobase/os/os0file.cc | 3 | ||||
| -rw-r--r-- | storage/xtradb/os/os0file.cc | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc index 5a945aae7bc..44093935bc7 100644 --- a/storage/innobase/os/os0file.cc +++ b/storage/innobase/os/os0file.cc @@ -569,10 +569,9 @@ os_file_get_last_error_low( REFMAN "operating-system-error-codes.html\n"); } + fflush(stderr); } - fflush(stderr); - if (err == ERROR_FILE_NOT_FOUND) { return(OS_FILE_NOT_FOUND); } else if (err == ERROR_DISK_FULL) { diff --git a/storage/xtradb/os/os0file.cc b/storage/xtradb/os/os0file.cc index 32536306320..f3c72576501 100644 --- a/storage/xtradb/os/os0file.cc +++ b/storage/xtradb/os/os0file.cc @@ -676,10 +676,9 @@ os_file_get_last_error_low( REFMAN "operating-system-error-codes.html\n"); } + fflush(stderr); } - fflush(stderr); - if (err == ERROR_FILE_NOT_FOUND) { return(OS_FILE_NOT_FOUND); } else if (err == ERROR_DISK_FULL) { |