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
e7ed4306
Commit
e7ed4306
authored
Mar 16, 2009
by
Chad MILLER
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix several quoting problems, and clean up IFS on failure in my_which().
parent
e53a8133
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
8 deletions
+12
-8
scripts/mysqld_safe.sh
scripts/mysqld_safe.sh
+12
-8
No files found.
scripts/mysqld_safe.sh
View file @
e7ed4306
...
@@ -18,7 +18,7 @@ niceness=0
...
@@ -18,7 +18,7 @@ niceness=0
logging
=
init
logging
=
init
want_syslog
=
0
want_syslog
=
0
syslog_tag
=
syslog_tag
=
user
=
@MYSQLD_USER@
user
=
'@MYSQLD_USER@'
pid_file
=
pid_file
=
err_log
=
err_log
=
...
@@ -64,9 +64,10 @@ my_which ()
...
@@ -64,9 +64,10 @@ my_which ()
{
{
save_ifs
=
"
${
IFS
-UNSET
}
"
save_ifs
=
"
${
IFS
-UNSET
}
"
IFS
=
:
IFS
=
:
ret
=
0
for
file
for
file
do
do
for
dir
in
$PATH
for
dir
in
"
$PATH
"
do
do
if
[
-f
"
$dir
/
$file
"
]
if
[
-f
"
$dir
/
$file
"
]
then
then
...
@@ -74,15 +75,18 @@ my_which ()
...
@@ -74,15 +75,18 @@ my_which ()
continue
2
continue
2
fi
fi
done
done
return
1
# Failure, didn't find file in path
ret
=
1
#signal an error
break
done
done
if
[
"
$save_ifs
"
=
UNSET
]
if
[
"
$save_ifs
"
=
UNSET
]
then
then
unset
IFS
unset
IFS
else
else
IFS
=
"
$save_ifs
"
IFS
=
"
$save_ifs
"
fi
fi
return
0
# Success
return
$ret
# Success
}
}
log_generic
()
{
log_generic
()
{
...
@@ -234,8 +238,8 @@ then
...
@@ -234,8 +238,8 @@ then
ledir
=
"
$MY_PWD
/libexec"
# Where mysqld is
ledir
=
"
$MY_PWD
/libexec"
# Where mysqld is
# Since we didn't find anything, used the compiled-in defaults
# Since we didn't find anything, used the compiled-in defaults
else
else
MY_BASEDIR_VERSION
=
@prefix@
MY_BASEDIR_VERSION
=
'@prefix@'
ledir
=
@libexecdir@
ledir
=
'@libexecdir@'
fi
fi
...
@@ -413,7 +417,7 @@ then
...
@@ -413,7 +417,7 @@ then
MYSQLD
=
mysqld
MYSQLD
=
mysqld
fi
fi
if
test
!
-x
$ledir
/
$MYSQLD
if
test
!
-x
"
$ledir
/
$MYSQLD
"
then
then
log_error
"The file
$ledir
/
$MYSQLD
log_error
"The file
$ledir
/
$MYSQLD
does not exist or is not executable. Please cd to the mysql installation
does not exist or is not executable. Please cd to the mysql installation
...
@@ -425,7 +429,7 @@ fi
...
@@ -425,7 +429,7 @@ fi
if
test
-z
"
$pid_file
"
if
test
-z
"
$pid_file
"
then
then
pid_file
=
$DATADIR
/
`
@HOSTNAME@
`
.pid
pid_file
=
"
$DATADIR
/
`
@HOSTNAME@
`
.pid"
else
else
case
"
$pid_file
"
in
case
"
$pid_file
"
in
/
*
)
;;
/
*
)
;;
...
...
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