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
596aca33
Commit
596aca33
authored
Apr 14, 2008
by
msvensson@pilot.mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set mysqladmin shutdown timeout to 60 seconds
parent
e549ec7f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
mysql-test/include/restart_mysqld.inc
mysql-test/include/restart_mysqld.inc
+1
-1
mysql-test/mysql-test-run.pl
mysql-test/mysql-test-run.pl
+1
-1
No files found.
mysql-test/include/restart_mysqld.inc
View file @
596aca33
...
...
@@ -2,7 +2,7 @@
# Write file to make mysql-test-run.pl expect crash and restart
--
exec
echo
"restart"
>
$MYSQLTEST_VARDIR
/
tmp
/
mysqld
.
1.
expect
--
exec
$MYSQLADMIN
--
defaults
-
file
=
$MYSQLTEST_VARDIR
/
my
.
cnf
shutdown
--
exec
$MYSQLADMIN
--
defaults
-
file
=
$MYSQLTEST_VARDIR
/
my
.
cnf
--
shutdown
-
timeout
=
60
shutdown
# Call script that will poll the server waiting for it to be gone
--
source
include
/
wait_until_disconnected
.
inc
...
...
mysql-test/mysql-test-run.pl
View file @
596aca33
...
...
@@ -2633,7 +2633,7 @@ sub check_expected_crash_and_restart {
my
$expect_file
=
"
$opt_vardir
/tmp/
"
.
$mysqld
->
name
()
.
"
.expect
";
if
(
-
f
$expect_file
)
{
mtr_
verbose
("
Crash was expected, file
$expect_file
exists
");
mtr_
report
("
Crash was expected, file '
$expect_file
'
exists
");
# Start server with same settings as last time
mysqld_start
(
$mysqld
,
$mysqld
->
{'
started_opts
'});
unlink
(
$expect_file
);
...
...
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