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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
eb20bd4b
Commit
eb20bd4b
authored
Jul 26, 2006
by
msvensson@neptunus.(none)
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
0d177b2d
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 @
eb20bd4b
...
@@ -367,7 +367,7 @@ sub mysqld_start ($$$);
...
@@ -367,7 +367,7 @@ sub mysqld_start ($$$);
sub
mysqld_arguments
($$$$$);
sub
mysqld_arguments
($$$$$);
sub
stop_all_servers
();
sub
stop_all_servers
();
sub
im_start
($$);
sub
im_start
($$);
sub
im_stop
($);
sub
im_stop
($
$
);
sub
run_mysqltest
($);
sub
run_mysqltest
($);
sub
usage
($);
sub
usage
($);
...
@@ -2364,7 +2364,7 @@ sub run_testcase ($) {
...
@@ -2364,7 +2364,7 @@ sub run_testcase ($) {
if
(
!
$glob_use_running_server
and
$tinfo
->
{'
component_id
'}
eq
'
im
'
and
if
(
!
$glob_use_running_server
and
$tinfo
->
{'
component_id
'}
eq
'
im
'
and
$instance_manager
->
{'
pid
'}
)
$instance_manager
->
{'
pid
'}
)
{
{
im_stop
(
$instance_manager
);
im_stop
(
$instance_manager
,
$tinfo
->
{'
name
'}
);
}
}
}
}
...
@@ -2904,7 +2904,7 @@ sub stop_all_servers () {
...
@@ -2904,7 +2904,7 @@ sub stop_all_servers () {
if
(
$instance_manager
->
{'
pid
'}
)
if
(
$instance_manager
->
{'
pid
'}
)
{
{
print
"
Shutting-down Instance Manager
\n
";
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
my
%
admin_pids
;
# hash of admin processes that requests shutdown
...
@@ -3423,8 +3423,9 @@ sub im_start($$) {
...
@@ -3423,8 +3423,9 @@ sub im_start($$) {
}
}
sub
im_stop
($)
{
sub
im_stop
($
$
)
{
my
$instance_manager
=
shift
;
my
$instance_manager
=
shift
;
my
$where
=
shift
;
# Obtain mysqld-process pids before we start stopping IM (it can delete pid
# Obtain mysqld-process pids before we start stopping IM (it can delete pid
# files).
# files).
...
@@ -3539,7 +3540,7 @@ sub im_stop($) {
...
@@ -3539,7 +3540,7 @@ sub im_stop($) {
my
$ts
=
localtime
();
my
$ts
=
localtime
();
print
ERRLOG
print
ERRLOG
"
Warning: [
$ts
] Instance Manager did not shutdown gracefully.
\n
";
"
[
$where
]
Warning: [
$ts
] Instance Manager did not shutdown gracefully.
\n
";
close
ERRLOG
;
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