diff options
| author | Anel Husakovic <anel@mariadb.org> | 2020-11-05 16:12:22 +0100 |
|---|---|---|
| committer | Anel Husakovic <anel@mariadb.org> | 2020-11-10 21:27:25 +0100 |
| commit | 3bf726f5ffc568b15e9788eddcfe87d81a5f6ed5 (patch) | |
| tree | 8ae4f6e9403bf833fc48ce94fbe31aeaabed90fc | |
| parent | 4548e74bcca1c97def4fbe44a28940d465f6555b (diff) | |
| download | mariadb-git-3bf726f5ffc568b15e9788eddcfe87d81a5f6ed5.tar.gz | |
MDEV-24130: Cannot launch mariadbd via mysqld_safe
- Patch 95bb3cb886cb64be3ee5ace660b used `my_which` function in `10.2`
- Based on patch `355ee6877bec` from 10.3+ `command -v` is used instead of
`my_which` so we are changing in this patch also
- `ldconfig` is usually found in `/sbin` so make sure it is added in
`$PATH` variable
| -rw-r--r-- | scripts/mysqld_safe.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 98398e5421f..8e8575f4c24 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -440,7 +440,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 |