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
4376118d
Commit
4376118d
authored
Jul 26, 2006
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add printout of where error occured when printing to error log in 'im_stop'
parent
9229ce4c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+6
-5
No files found.
mysql-test/mysql-test-run.pl
View file @
4376118d
...
...
@@ -367,7 +367,7 @@ sub mysqld_start ($$$);
sub
mysqld_arguments
($$$$$);
sub
stop_all_servers
();
sub
im_start
($$);
sub
im_stop
($);
sub
im_stop
($
$
);
sub
run_mysqltest
($);
sub
usage
($);
...
...
@@ -2364,7 +2364,7 @@ sub run_testcase ($) {
if
(
!
$glob_use_running_server
and
$tinfo
->
{'
component_id
'}
eq
'
im
'
and
$instance_manager
->
{'
pid
'}
)
{
im_stop
(
$instance_manager
);
im_stop
(
$instance_manager
,
$tinfo
->
{'
name
'}
);
}
}
...
...
@@ -2904,7 +2904,7 @@ sub stop_all_servers () {
if
(
$instance_manager
->
{'
pid
'}
)
{
print
"
Shutting-down Instance Manager
\n
";
im_stop
(
$instance_manager
);
im_stop
(
$instance_manager
,
"
stop_all_servers
"
);
}
my
%
admin_pids
;
# hash of admin processes that requests shutdown
...
...
@@ -3423,8 +3423,9 @@ sub im_start($$) {
}
sub
im_stop
($)
{
sub
im_stop
($
$
)
{
my
$instance_manager
=
shift
;
my
$where
=
shift
;
# Obtain mysqld-process pids before we start stopping IM (it can delete pid
# files).
...
...
@@ -3539,7 +3540,7 @@ sub im_stop($) {
my
$ts
=
localtime
();
print
ERRLOG
"
Warning: [
$ts
] Instance Manager did not shutdown gracefully.
\n
";
"
[
$where
]
Warning: [
$ts
] Instance Manager did not shutdown gracefully.
\n
";
close
ERRLOG
;
}
...
...
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