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
db84337b
Commit
db84337b
authored
Jun 29, 2007
by
msvensson@pilot.(none)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reduce time for mysqladmin to try to shutdown servers from 70 to 20 seconds
parent
d84f91eb
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
mysql-test/lib/mtr_process.pl
mysql-test/lib/mtr_process.pl
+1
-1
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+2
-2
No files found.
mysql-test/lib/mtr_process.pl
View file @
db84337b
...
@@ -359,7 +359,7 @@ sub mtr_kill_leftovers () {
...
@@ -359,7 +359,7 @@ sub mtr_kill_leftovers () {
"
socket: '
$srv
->{path_sock}';
"
.
"
socket: '
$srv
->{path_sock}';
"
.
"
port:
$srv
->{port})
");
"
port:
$srv
->{port})
");
my
$pid
=
mtr_mysqladmin_start
(
$srv
,
"
shutdown
",
7
0
);
my
$pid
=
mtr_mysqladmin_start
(
$srv
,
"
shutdown
",
2
0
);
# Save the pid of the mysqladmin process
# Save the pid of the mysqladmin process
$admin_pids
{
$pid
}
=
1
;
$admin_pids
{
$pid
}
=
1
;
...
...
mysql-test/mysql-test-run.pl
View file @
db84337b
...
@@ -4328,7 +4328,7 @@ sub run_testcase_stop_servers($$$) {
...
@@ -4328,7 +4328,7 @@ sub run_testcase_stop_servers($$$) {
{
{
if
(
$mysqld
->
{'
pid
'}
)
if
(
$mysqld
->
{'
pid
'}
)
{
{
$pid
=
mtr_mysqladmin_start
(
$mysqld
,
"
shutdown
",
7
0
);
$pid
=
mtr_mysqladmin_start
(
$mysqld
,
"
shutdown
",
2
0
);
$admin_pids
{
$pid
}
=
1
;
$admin_pids
{
$pid
}
=
1
;
...
@@ -4380,7 +4380,7 @@ sub run_testcase_stop_servers($$$) {
...
@@ -4380,7 +4380,7 @@ sub run_testcase_stop_servers($$$) {
{
{
if
(
$mysqld
->
{'
pid
'}
)
if
(
$mysqld
->
{'
pid
'}
)
{
{
$pid
=
mtr_mysqladmin_start
(
$mysqld
,
"
shutdown
",
7
0
);
$pid
=
mtr_mysqladmin_start
(
$mysqld
,
"
shutdown
",
2
0
);
$admin_pids
{
$pid
}
=
1
;
$admin_pids
{
$pid
}
=
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