summaryrefslogtreecommitdiff
path: root/scripts/mysqld_safe.sh
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-11-13 21:54:21 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2020-11-13 21:54:21 +0200
commitd7a582489900ea175d9659304c4fdc39b3880014 (patch)
tree06a2485b15b84fedf197c573276441ea8d8bccb0 /scripts/mysqld_safe.sh
parent97569d3c37a66bc941b933ac7c2cefa5430a5175 (diff)
parentb2029c0300bf8c311ff5d9fdc4b73a9e48bf6930 (diff)
downloadmariadb-git-d7a582489900ea175d9659304c4fdc39b3880014.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'scripts/mysqld_safe.sh')
-rw-r--r--scripts/mysqld_safe.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index c284e75a248..85c9363081c 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -449,7 +449,8 @@ mysqld_ld_preload_text() {
set_malloc_lib() {
malloc_lib="$1"
if expr "$malloc_lib" : "\(tcmalloc\|jemalloc\)" > /dev/null ; then
- if ! my_which ldconfig > /dev/null 2>&1
+ export PATH=$PATH:/sbin
+ if ! command -v ldconfig > /dev/null 2>&1
then
log_error "ldconfig command not found, required for ldconfig -p"
exit 1