diff options
| author | Jonathan Perkin <jonathan.perkin@oracle.com> | 2010-05-12 16:32:31 +0100 |
|---|---|---|
| committer | Jonathan Perkin <jonathan.perkin@oracle.com> | 2010-05-12 16:32:31 +0100 |
| commit | f9101d98b73f8353bc1de0959c6a1a35a91a9f7b (patch) | |
| tree | 599d21d4570459aea70266f1412326c7228e6f61 | |
| parent | 31f5867fc32ae0aaacf2c3a2d142810325dfa3e0 (diff) | |
| download | mariadb-git-f9101d98b73f8353bc1de0959c6a1a35a91a9f7b.tar.gz | |
Revert back to new CMake names for audit_null/daemon_example plugins.
| -rw-r--r-- | plugin/audit_null/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | plugin/daemon_example/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | support-files/mysql.spec.sh | 8 |
3 files changed, 6 insertions, 8 deletions
diff --git a/plugin/audit_null/CMakeLists.txt b/plugin/audit_null/CMakeLists.txt index 4baa1da35fe..4e27ae7e0d9 100644 --- a/plugin/audit_null/CMakeLists.txt +++ b/plugin/audit_null/CMakeLists.txt @@ -13,5 +13,4 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -MYSQL_ADD_PLUGIN(audit_null audit_null.c - MODULE_ONLY MODULE_OUTPUT_NAME "adt_null") +MYSQL_ADD_PLUGIN(audit_null audit_null.c MODULE_ONLY) diff --git a/plugin/daemon_example/CMakeLists.txt b/plugin/daemon_example/CMakeLists.txt index de4310b0244..1c21d57b326 100644 --- a/plugin/daemon_example/CMakeLists.txt +++ b/plugin/daemon_example/CMakeLists.txt @@ -13,5 +13,4 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -MYSQL_ADD_PLUGIN(daemon_example daemon_example.cc - MODULE_ONLY MODULE_OUTPUT_NAME "libdaemon_example") +MYSQL_ADD_PLUGIN(daemon_example daemon_example.cc MODULE_ONLY) diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 46a8c7d54f1..657dd3fbbdf 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -740,13 +740,13 @@ fi %attr(755, root, root) %{_sbindir}/mysqld %attr(755, root, root) %{_sbindir}/mysqld-debug %attr(755, root, root) %{_sbindir}/rcmysql -%attr(755, root, root) %{_libdir}/mysql/plugin/adt_null.so -%attr(755, root, root) %{_libdir}/mysql/plugin/libdaemon_example.so +%attr(755, root, root) %{_libdir}/mysql/plugin/audit_null.so +%attr(755, root, root) %{_libdir}/mysql/plugin/daemon_example.so %attr(755, root, root) %{_libdir}/mysql/plugin/mypluglib.so %attr(755, root, root) %{_libdir}/mysql/plugin/semisync_master.so %attr(755, root, root) %{_libdir}/mysql/plugin/semisync_slave.so -%attr(755, root, root) %{_libdir}/mysql/plugin/debug/adt_null.so -%attr(755, root, root) %{_libdir}/mysql/plugin/debug/libdaemon_example.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/audit_null.so +%attr(755, root, root) %{_libdir}/mysql/plugin/debug/daemon_example.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/mypluglib.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_master.so %attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_slave.so |