diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-11-09 13:43:22 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-11-13 18:41:55 +0000 |
| commit | 05103c84ecc519eae4090b720f48203a648e2ab9 (patch) | |
| tree | 0cb84b9ba95ff14792e44b4251a94047f5b5669d /sql | |
| parent | 8b18a44fa7e5ddf6c8caee37de4f6112c64dfc87 (diff) | |
| download | mariadb-git-05103c84ecc519eae4090b720f48203a648e2ab9.tar.gz | |
MDEV-14205 Windows : fix race condition writing into error log and setvbufmariadb-10.1.29
Do not do reopen_fstreams/setbuf twice during server startup on Windows.
fprintf(stderr,..) might crash, if setbuf is executed at the same time.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 97d63d99458..8b7fdd2f705 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5747,9 +5747,6 @@ int mysqld_main(int argc, char **argv) #ifdef __WIN__ if (!opt_console) { - if (reopen_fstreams(log_error_file, stdout, stderr)) - unireg_abort(1); - setbuf(stderr, NULL); FreeConsole(); // Remove window } |