diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-09-15 14:12:51 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-09-15 14:12:51 +0200 |
| commit | 2a4c97fc3eb90c49f81219183dd6d9b998df3077 (patch) | |
| tree | a6b1bc74538540131a415155302fd9dedd4cce61 /support-files/mysql.spec.sh | |
| parent | 85c97f96c0afc2f311ac311309975f6d806a9f44 (diff) | |
| parent | 71f4bfd6c7dba0ea4b00469d48e458f0e5eeaf67 (diff) | |
| download | mariadb-git-2a4c97fc3eb90c49f81219183dd6d9b998df3077.tar.gz | |
MySQL 5.1.38 merge into MariaDB.
Merge remaining bits of mysql-5.1.38 into MariaDB (9 commits were missing
from the original merge).
Diffstat (limited to 'support-files/mysql.spec.sh')
| -rw-r--r-- | support-files/mysql.spec.sh | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 2c62edc1c52..b0a584385ef 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -344,7 +344,7 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \ --with-blackhole-storage-engine \ --with-federated-storage-engine \ --without-plugin-daemon_example \ - --without-plugin-example \ + --without-plugin-ftexample \ --with-partition \ --with-big-tables \ %if %{WITH_BUNDLED_ZLIB} @@ -750,7 +750,11 @@ fi %attr(755, root, root) %{_bindir}/resolve_stack_dump %attr(755, root, root) %{_bindir}/resolveip -%attr(755, root, root) %{_libdir}/plugin/*.so* +%attr(755, root, root) %{_libdir}/mysql/plugin/ha_example.so* +%if %{WITHOUT_INNODB_PLUGIN} +%else +%attr(755, root, root) %{_libdir}/mysql/plugin/ha_innodb_plugin.so* +%endif %attr(755, root, root) %{_sbindir}/mysqld %attr(755, root, root) %{_sbindir}/mysqld-debug @@ -877,8 +881,13 @@ fi %{_libdir}/mysql/libvio.a %{_libdir}/mysql/libz.a %{_libdir}/mysql/libz.la -%{_libdir}/plugin/*.a -%{_libdir}/plugin/*.la +%{_libdir}/mysql/plugin/ha_example.a +%{_libdir}/mysql/plugin/ha_example.la +%if %{WITHOUT_INNODB_PLUGIN} +%else +%{_libdir}/mysql/plugin/ha_innodb_plugin.a +%{_libdir}/mysql/plugin/ha_innodb_plugin.la +%endif %files shared %defattr(-, root, root, 0755) @@ -915,7 +924,7 @@ fi * Fri Aug 21 2009 Jonathan Perkin <jperkin@sun.com> - Install plugin libraries in appropriate packages. -- Disable example plugins. +- Disable libdaemon_example and ftexample plugins. * Thu Aug 20 2009 Jonathan Perkin <jperkin@stripped> |