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
1294e712
Commit
1294e712
authored
Sep 01, 2006
by
anozdrin/alik@alik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix typo, which prevents test suite from correct cleanup.
parent
725bb2e6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
6 deletions
+5
-6
mysql-test/lib/mtr_process.pl
mysql-test/lib/mtr_process.pl
+5
-6
No files found.
mysql-test/lib/mtr_process.pl
View file @
1294e712
...
@@ -31,7 +31,7 @@ sub mtr_im_check_alive ($);
...
@@ -31,7 +31,7 @@ sub mtr_im_check_alive ($);
sub
mtr_im_check_main_alive
($);
sub
mtr_im_check_main_alive
($);
sub
mtr_im_check_angel_alive
($);
sub
mtr_im_check_angel_alive
($);
sub
mtr_im_check_mysqlds_alive
($);
sub
mtr_im_check_mysqlds_alive
($);
sub
mtr_im_check_mysqld_alive
($
$
);
sub
mtr_im_check_mysqld_alive
($);
sub
mtr_im_cleanup
($);
sub
mtr_im_cleanup
($);
sub
mtr_im_rm_file
($);
sub
mtr_im_rm_file
($);
sub
mtr_im_errlog
($);
sub
mtr_im_errlog
($);
...
@@ -1279,21 +1279,20 @@ sub mtr_im_check_mysqlds_alive($) {
...
@@ -1279,21 +1279,20 @@ sub mtr_im_check_mysqlds_alive($) {
mtr_debug
("
Checking mysqld[
$idx
]...
");
mtr_debug
("
Checking mysqld[
$idx
]...
");
return
1
return
1
if
mtr_im_check_mysqld_alive
(
$instance
_manager
,
$instance
s
->
[
$idx
]);
if
mtr_im_check_mysqld_alive
(
$instances
->
[
$idx
]);
}
}
}
}
###########################################################################
###########################################################################
sub
mtr_im_check_mysqld_alive
($$)
{
sub
mtr_im_check_mysqld_alive
($)
{
my
$instance_manager
=
shift
;
my
$mysqld_instance
=
shift
;
my
$mysqld_instance
=
shift
;
# Check that the process is dead.
# Check that the process is dead.
if
(
defined
$
instance_manager
->
{'
pid
'})
if
(
defined
$
mysqld_instance
->
{'
pid
'})
{
{
if
(
kill
(
0
,
$
instance_manager
->
{'
pid
'}))
if
(
kill
(
0
,
$
mysqld_instance
->
{'
pid
'}))
{
{
mtr_debug
("
Mysqld instance (PID:
$mysqld_instance
->{pid}) is alive.
");
mtr_debug
("
Mysqld instance (PID:
$mysqld_instance
->{pid}) is alive.
");
return
1
;
return
1
;
...
...
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