summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-11-12 11:18:04 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2020-11-12 11:18:04 +0200
commit972dc6ee98b6447363ccbc5dcb921d3542d7d238 (patch)
tree2b2317a9e8a61a6ac385e7c1592eb921a4be36c8 /scripts
parent2fbcddbeafb558720f4b74b0a8f68c18b48d9f2e (diff)
parent150f447af1d9ffff168372505e5c9b4297bdd9d4 (diff)
downloadmariadb-git-972dc6ee98b6447363ccbc5dcb921d3542d7d238.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'scripts')
-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 6225b99276c..c5857713ec9 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