diff options
| author | Jonathan Perkin <jperkin@sun.com> | 2009-09-03 01:48:06 +0200 |
|---|---|---|
| committer | Jonathan Perkin <jperkin@sun.com> | 2009-09-03 01:48:06 +0200 |
| commit | 0644b0acfa43206cd87270557b041f921fa92f02 (patch) | |
| tree | b01af07a6a5a0b7f510e606c065e77952a6c015a /support-files/mysql.spec.sh | |
| parent | 41427950ed8bf62628d99936686d1f2db0528336 (diff) | |
| parent | 71f4bfd6c7dba0ea4b00469d48e458f0e5eeaf67 (diff) | |
| download | mariadb-git-0644b0acfa43206cd87270557b041f921fa92f02.tar.gz | |
Merge from mysql-5.1.38-release
Diffstat (limited to 'support-files/mysql.spec.sh')
| -rw-r--r-- | support-files/mysql.spec.sh | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 5b8d7a5922d..8209c4560c6 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -319,7 +319,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} @@ -715,7 +715,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 @@ -842,8 +846,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) @@ -880,9 +889,9 @@ 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> +* Thu Aug 20 2009 Jonathan Perkin <jperkin@sun.com> - Update variable used for mysql-test suite location to match source. |