Skip to content

Commit 1235719

Browse files
trostenbjornmu
authored andcommitted
Merge branch 'mysql-5.5' into mysql-5.6
(cherry picked from commit fa1aafe9819cb2d9389968f95f91f00f58997df4)
1 parent c5b22c1 commit 1235719

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

scripts/mysqld_safe.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ set_malloc_lib() {
322322

323323
if [ "$malloc_lib" = tcmalloc ]; then
324324
malloc_lib=
325-
for libdir in $(echo $malloc_dirs); do
325+
for libdir in `echo $malloc_dirs`; do
326326
for flavor in _minimal '' _and_profiler _debug; do
327327
tmp="$libdir/libtcmalloc$flavor.so"
328328
#log_notice "DEBUG: Checking for malloc lib '$tmp'"
@@ -349,7 +349,7 @@ set_malloc_lib() {
349349
fi
350350

351351
# Restrict to a the list in $malloc_dirs above
352-
case "$(dirname "$malloc_lib")" in
352+
case "`dirname "$malloc_lib"`" in
353353
/usr/lib) ;;
354354
/usr/lib64) ;;
355355
/usr/lib/i386-linux-gnu) ;;

0 commit comments

Comments
 (0)