diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-10-19 22:41:18 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-10-19 22:41:18 +0400 |
| commit | 2c3d501189bd135a5e136ed56656df7bea25fda7 (patch) | |
| tree | 7a84c42b5a5a6765a8a4ca28296e75b0349834c9 /support-files | |
| parent | bd60794fd8e532616f5b5f6d2200af0f4c7bc5ef (diff) | |
| parent | a1ac1b7d48c0e3361f1c1d77dc1a4991f78d4581 (diff) | |
| download | mariadb-git-2c3d501189bd135a5e136ed56656df7bea25fda7.tar.gz | |
Automerge from mysql-trunk-merge.
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 d5bb18d8483..239611c0b53 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 |