diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-09-19 13:07:51 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-09-19 13:07:51 +0400 |
| commit | ede2edd19b1baf4e8677f8bdc7e853c05eb5a4d5 (patch) | |
| tree | 46e87f02d924b89bde60832867a57dd1b082b48a /support-files | |
| parent | e60ff2b6a30f207f18760ca9a0de444110e800f5 (diff) | |
| parent | 19d0529819c65dc4662b6a388fea7fbc7323b2f1 (diff) | |
| download | mariadb-git-ede2edd19b1baf4e8677f8bdc7e853c05eb5a4d5.tar.gz | |
Merge from mysql-5.1.
Diffstat (limited to 'support-files')
| -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 02561a2551d..60bf9213362 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -309,7 +309,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} @@ -701,7 +701,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 @@ -827,8 +831,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) @@ -874,9 +883,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. |