Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
backupninja
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
lyz
backupninja
Commits
94861df6
Commit
94861df6
authored
16 years ago
by
intrigeri
Browse files
Options
Downloads
Patches
Plain Diff
mysql: fix 'mysqladmin ping' use, see changelog for details
parent
a1c625fc
No related branches found
No related tags found
Loading
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ChangeLog
+5
-0
5 additions, 0 deletions
ChangeLog
handlers/mysql.in
+4
-4
4 additions, 4 deletions
handlers/mysql.in
with
9 additions
and
4 deletions
ChangeLog
+
5
−
0
View file @
94861df6
...
...
@@ -13,6 +13,11 @@ version 0.9.7 -- UNRELEASED
. Options passed to mysqldump are now customizable with the new
sqldumpoptions configuration variable. Thanks to Chris Lamb for his
preliminary patch (Closes: #502966)
. Hide 'mysqladmin ping' output, to prevent confusing the user in
case mysqld is running but the authentication fails, which apparently
does not prevent mysqldump to work.
. Fix the error message displayed when mysqld is not running:
mysqladmin ping indeed returns 0 when authentication fails.
version 0.9.6 -- July 21, 2008
backupninja changes
...
...
This diff is collapsed.
Click to expand it.
handlers/mysql.in
+
4
−
4
View file @
94861df6
...
...
@@ -266,9 +266,9 @@ then
if
[
$usevserver
=
yes
]
then
# Test to make sure mysqld is running, if it is not sqldump will not work
$VSERVER
$vsname
exec
su
$user
-c
"
$MYSQLADMIN
$defaultsfile
ping"
$VSERVER
$vsname
exec
su
$user
-c
"
$MYSQLADMIN
$defaultsfile
ping
2>&1 >/dev/null
"
if
[
$?
-ne
0
]
;
then
fatal
"
Either you have an authentication problem, or
mysqld doesn't appear to be running!"
fatal
"mysqld doesn't appear to be running!"
fi
if
[
"
$compress
"
==
"yes"
]
;
then
execstr
=
"
$VSERVER
$vsname
exec
$DUMP
|
$GZIP
>
$vroot$dumpdir
/
${
db
}
.sql.gz"
...
...
@@ -277,9 +277,9 @@ then
fi
else
# Test to make sure mysqld is running, if it is not sqldump will not work
su
$user
-c
"
$MYSQLADMIN
$defaultsfile
ping"
su
$user
-c
"
$MYSQLADMIN
$defaultsfile
ping
2>&1 >/dev/null
"
if
[
$?
-ne
0
]
;
then
fatal
"
Either you have an authentication problem, or
mysqld doesn't appear to be running!"
fatal
"mysqld doesn't appear to be running!"
fi
if
[
"
$compress
"
==
"yes"
]
;
then
execstr
=
"
$DUMP
|
$GZIP
>
$dumpdir
/
${
db
}
.sql.gz"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment