Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
a80bd0b5
Commit
a80bd0b5
authored
Jul 23, 2009
by
Bjorn Munch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug #46212 safe_process: FATAL ERROR, Unknown option: --nocore
Also fixed mysqld.cc to avoid popup-boxes
parent
b9720c71
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
20 deletions
+29
-20
mysql-test/lib/My/SafeProcess/safe_process_win.cc
mysql-test/lib/My/SafeProcess/safe_process_win.cc
+20
-10
sql/mysqld.cc
sql/mysqld.cc
+9
-10
No files found.
mysql-test/lib/My/SafeProcess/safe_process_win.cc
View file @
a80bd0b5
...
...
@@ -163,6 +163,7 @@ int main(int argc, const char** argv )
HANDLE
job_handle
;
HANDLE
wait_handles
[
NUM_HANDLES
]
=
{
0
};
PROCESS_INFORMATION
process_info
=
{
0
};
BOOL
nocore
=
FALSE
;
sprintf
(
safe_process_name
,
"safe_process[%d]"
,
pid
);
...
...
@@ -199,18 +200,22 @@ int main(int argc, const char** argv )
}
break
;
}
else
{
if
(
strcmp
(
arg
,
"--verbose"
)
==
0
)
if
(
strcmp
(
arg
,
"--verbose"
)
==
0
)
verbose
++
;
else
if
(
strncmp
(
arg
,
"--parent-pid"
,
10
)
==
0
)
{
/* Override parent_pid with a value provided by user */
const
char
*
start
;
else
if
(
strncmp
(
arg
,
"--parent-pid"
,
10
)
==
0
)
{
/* Override parent_pid with a value provided by user */
const
char
*
start
;
if
((
start
=
strstr
(
arg
,
"="
))
==
NULL
)
die
(
"Could not find start of option value in '%s'"
,
arg
);
start
++
;
/* Step past = */
if
((
parent_pid
=
atoi
(
start
))
==
0
)
die
(
"Invalid value '%s' passed to --parent-id"
,
start
);
}
die
(
"Could not find start of option value in '%s'"
,
arg
);
start
++
;
/* Step past = */
if
((
parent_pid
=
atoi
(
start
))
==
0
)
die
(
"Invalid value '%s' passed to --parent-id"
,
start
);
}
else
if
(
strcmp
(
arg
,
"--nocore"
)
==
0
)
{
nocore
=
TRUE
;
}
else
die
(
"Unknown option: %s"
,
arg
);
}
...
...
@@ -248,6 +253,11 @@ int main(int argc, const char** argv )
&
jeli
,
sizeof
(
jeli
))
==
0
)
message
(
"SetInformationJobObject failed, continue anyway..."
);
/* Avoid popup box */
if
(
nocore
)
SetErrorMode
(
SEM_FAILCRITICALERRORS
|
SEM_NOGPFAULTERRORBOX
|
SEM_NOOPENFILEERRORBOX
);
#if 0
/* Setup stdin, stdout and stderr redirect */
si.dwFlags= STARTF_USESTDHANDLES;
...
...
sql/mysqld.cc
View file @
a80bd0b5
...
...
@@ -2103,15 +2103,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 (),
...
...
@@ -2120,8 +2119,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
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment