summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorTerje Rosten <terje.rosten@oracle.com>2016-08-26 11:25:40 +0200
committerTerje Rosten <terje.rosten@oracle.com>2016-08-26 11:25:40 +0200
commit7603ac53c86ea1a31a1511b5d630a24faf5de58c (patch)
tree5b97d47ce7a6212196ca76e1ddb1406cb6b49e9b /scripts
parent97fad8518bdce19938fdf55cbb5858e31e9ac464 (diff)
downloadmariadb-git-7603ac53c86ea1a31a1511b5d630a24faf5de58c.tar.gz
Bug#24464380 PRIVILEGE ESCALATION USING MYSQLD_SAFE
Post push fix: Solaris 10 /bin/sh don't understand $().
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysqld_safe.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index 11b692ec928..1b30a3bb15b 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -321,7 +321,7 @@ set_malloc_lib() {
if [ "$malloc_lib" = tcmalloc ]; then
malloc_lib=
- for libdir in $(echo $malloc_dirs); do
+ for libdir in `echo $malloc_dirs`; do
for flavor in _minimal '' _and_profiler _debug; do
tmp="$libdir/libtcmalloc$flavor.so"
#log_notice "DEBUG: Checking for malloc lib '$tmp'"
@@ -348,7 +348,7 @@ set_malloc_lib() {
fi
# Restrict to a the list in $malloc_dirs above
- case "$(dirname "$malloc_lib")" in
+ case "`dirname "$malloc_lib"`" in
/usr/lib) ;;
/usr/lib64) ;;
/usr/lib/i386-linux-gnu) ;;