diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-19 22:40:08 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-19 22:40:08 +0400 |
| commit | 01a9db06219b6980df7c26ab1ed9e3382db3e0be (patch) | |
| tree | f70e29135e5b44eff0e1b2991376b21815980214 /support-files | |
| parent | b930b18ec3463e47736647c26af0eea07c242a63 (diff) | |
| parent | 813d8ff6dc298ec18c251c3d0e59ba9823331f1a (diff) | |
| download | mariadb-git-01a9db06219b6980df7c26ab1ed9e3382db3e0be.tar.gz | |
Automerge from mysql-trunk.
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 60bf9213362..3c80304330b 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -448,6 +448,13 @@ $MBD/libtool --mode=execute install -m 755 \ $RPM_BUILD_DIR/mysql-%{mysql_version}/mysql-debug-%{mysql_version}/sql/mysqld \ $RBR%{_sbindir}/mysqld-debug +%if %{?malloc_lib_target:1}%{!?malloc_lib_target:0} +# Even though this is a shared library, put it under /usr/lib/mysql, so it +# doesn't conflict with possible shared lib by the same name in /usr/lib. See +# `mysql_config --variable=pkglibdir` and mysqld_safe for how this is used. +install -m 644 "%{malloc_lib_source}" "$RBR%{_libdir}/mysql/%{malloc_lib_target}" +%endif + # install saved perror binary with NDB support (BUG#13740) install -m 755 $MBD/extra/perror $RBR%{_bindir}/perror @@ -707,6 +714,10 @@ fi %attr(755, root, root) %{_libdir}/mysql/plugin/ha_innodb_plugin.so* %endif +%if %{?malloc_lib_target:1}%{!?malloc_lib_target:0} +%attr(755, root, root) %{_libdir}/mysql/%{malloc_lib_target} +%endif + %attr(755, root, root) %{_sbindir}/mysqld %attr(755, root, root) %{_sbindir}/mysqld-debug %attr(755, root, root) %{_sbindir}/rcmysql |