diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-09-18 16:35:40 +0300 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-09-18 16:35:40 +0300 |
| commit | 4ac694822b7b2e0b7c7867d265e4bb187b0adc67 (patch) | |
| tree | a65b46eab2660f0760ae30202474403d94080381 /sql/mysqld.cc | |
| parent | 5080092322817d76c0962f196dc967867e07b20d (diff) | |
| parent | 0b9bc329b037777c48668ae0045eee3acd637149 (diff) | |
| download | mariadb-git-4ac694822b7b2e0b7c7867d265e4bb187b0adc67.tar.gz | |
automerge
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 3a8ecaf4439..430592e7688 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2119,15 +2119,14 @@ static void init_signals(void) win_install_sigabrt_handler(); if(opt_console) SetConsoleCtrlHandler(console_event_handler,TRUE); - else - { + /* Avoid MessageBox()es*/ - _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE); - _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR); - _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_FILE); - _CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR); - _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE); - _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR); + _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE); + _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR); + _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_FILE); + _CrtSetReportFile(_CRT_ERROR, _CRTDBG_FILE_STDERR); + _CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE); + _CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR); /* Do not use SEM_NOGPFAULTERRORBOX in the following SetErrorMode (), @@ -2136,8 +2135,8 @@ static void init_signals(void) exception filter is not guaranteed to work in all situation (like heap corruption or stack overflow) */ - SetErrorMode(SetErrorMode(0)|SEM_FAILCRITICALERRORS|SEM_NOOPENFILEERRORBOX); - } + SetErrorMode(SetErrorMode(0) | SEM_FAILCRITICALERRORS + | SEM_NOOPENFILEERRORBOX); SetUnhandledExceptionFilter(my_unhandler_exception_filter); } |