summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorJonathan Perkin <jperkin@sun.com>2009-08-24 14:06:01 +0200
committerJonathan Perkin <jperkin@sun.com>2009-08-24 14:06:01 +0200
commitc2bd07ca9cd848c58dcd243551e4d52e68bbb449 (patch)
tree4c1fd57bf8524c15c8f739b0e443afad1f979abd /support-files
parentdf91ff571b36a2428b31d667944eb72a10cf1449 (diff)
downloadmariadb-git-c2bd07ca9cd848c58dcd243551e4d52e68bbb449.tar.gz
Tidy previous, put example storage engine back as it's used by tests.
Diffstat (limited to 'support-files')
-rw-r--r--support-files/mysql.spec.sh20
1 files changed, 15 insertions, 5 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 5b8d7a5922d..fbb569e0c8c 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -319,7 +319,6 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
--with-blackhole-storage-engine \
--with-federated-storage-engine \
--without-plugin-daemon_example \
- --without-plugin-example \
--with-partition \
--with-big-tables \
%if %{WITH_BUNDLED_ZLIB}
@@ -715,7 +714,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 +845,15 @@ 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
+%{_libdir}/mysql/plugin/mypluglib.a
+%{_libdir}/mysql/plugin/mypluglib.la
%files shared
%defattr(-, root, root, 0755)
@@ -880,7 +890,7 @@ fi
* Fri Aug 21 2009 Jonathan Perkin <jperkin@sun.com>
- Install plugin libraries in appropriate packages.
-- Disable example plugins.
+- Disable libdaemon_example plugin.
* Thu Aug 20 2009 Jonathan Perkin <jperkin@stripped>