diff options
| author | Marc Alff <marc.alff@sun.com> | 2009-09-22 09:22:22 -0600 |
|---|---|---|
| committer | Marc Alff <marc.alff@sun.com> | 2009-09-22 09:22:22 -0600 |
| commit | 1ecaf1bc1e589a7246b2a4c18490ecf96209154e (patch) | |
| tree | f50d0786b7febfa78df5449712a9ae6295382d08 /sql/mysqld.cc | |
| parent | 4fa77f94b69c8f4f6f5173e22a9fd8b39e031908 (diff) | |
| parent | 3b494279bb5612663bcced12d728dac5fb07f384 (diff) | |
| download | mariadb-git-1ecaf1bc1e589a7246b2a4c18490ecf96209154e.tar.gz | |
Merge mysql-next-mr (revno 2882) --> mysql-trunk-signal
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 e3b744e5e01..bb79f931fb3 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2138,15 +2138,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 (), @@ -2155,8 +2154,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); } |