summaryrefslogtreecommitdiff
path: root/scripts/mysqld_safe.sh
diff options
context:
space:
mode:
authorJonathan Perkin <jonathan.perkin@oracle.com>2010-05-12 12:51:23 +0100
committerJonathan Perkin <jonathan.perkin@oracle.com>2010-05-12 12:51:23 +0100
commitce2aabb712622fa1e52d9f294f78f4def52a4c78 (patch)
treea78a148e61b420dbc018bdccd10f82401ea17468 /scripts/mysqld_safe.sh
parent240176bfa3228316ac012575a924f3dad8f5bb3b (diff)
downloadmariadb-git-ce2aabb712622fa1e52d9f294f78f4def52a4c78.tar.gz
Changes to build using CMake according to existing release packages:
- Update/fix file layouts for each package type, add new types for native package formats including deb, rpm and svr4. - Build all plugins, including debug versions - Update compiler flags to match current release - Add missing @VAR@ expansions - Install correct mysqclient library symlinks - Fix icc/ia64 builds - Fix install of libmysqld-debug - Don't include mysql_embedded - Remove unpackaged manual pages to avoid missing files warnings - Don't install mtr's test suite
Diffstat (limited to 'scripts/mysqld_safe.sh')
-rw-r--r--scripts/mysqld_safe.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index 59e7e8b7ef7..4514b5437b7 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -306,7 +306,7 @@ set_malloc_lib() {
malloc_lib=
# This list is kept intentionally simple. Simply set --malloc-lib
# to a full path if another location is desired.
- for libdir in /usr/lib "$pkglibdir"; do
+ for libdir in /usr/lib "$pkglibdir" "$pkglibdir/mysql"; do
for flavor in _minimal '' _and_profiler _debug; do
tmp="$libdir/libtcmalloc$flavor.so"
#log_notice "DEBUG: Checking for malloc lib '$tmp'"