diff options
| author | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2011-08-15 18:29:38 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2011-08-15 18:29:38 +0400 |
| commit | 6e5bbf513810448e84872069065a0561e0d70a93 (patch) | |
| tree | e40e3ed079113e0bbbb9270aaccddcea851b3d77 /plugin | |
| parent | 888b8793a256040ab9b7e008c52936da75a3d116 (diff) | |
| download | mariadb-git-6e5bbf513810448e84872069065a0561e0d70a93.tar.gz | |
Cherry-picking WL#5710 from mysql-5.5 to mysql-5.5.16-release.
Original revision id:
# revno: 3489 [merge]
# revision-id: tatjana.nuernberg@oracle.com-20110811120945-c6x9a5d2du8s9oj2
# parent: tatjana.nuernberg@oracle.com-20110811112736-so8r813hs8dmf7nr
# parent: chuck.bell@oracle.com-20110810183949-2s9uxcuoux2p668e
# committer: Tatjana Azundris Nuernberg <tatjana.nuernberg@oracle.com>
# branch nick: 55-9
# timestamp: Thu 2011-08-11 13:09:45 +0100
# message:
# auto-merge
This merge revision also has a patch for Bug 12664445, which has been also
taken to 5.5.16.
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/daemon_example/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | plugin/daemon_example/daemon_example.ini | 9 |
2 files changed, 11 insertions, 0 deletions
diff --git a/plugin/daemon_example/CMakeLists.txt b/plugin/daemon_example/CMakeLists.txt index 60aa00687ba..1623c3025d7 100644 --- a/plugin/daemon_example/CMakeLists.txt +++ b/plugin/daemon_example/CMakeLists.txt @@ -15,3 +15,5 @@ MYSQL_ADD_PLUGIN(daemon_example daemon_example.cc MODULE_ONLY MODULE_OUTPUT_NAME "libdaemon_example") + +INSTALL(FILES daemon_example.ini DESTINATION ${INSTALL_PLUGINDIR}) diff --git a/plugin/daemon_example/daemon_example.ini b/plugin/daemon_example/daemon_example.ini new file mode 100644 index 00000000000..7c6d4d1456e --- /dev/null +++ b/plugin/daemon_example/daemon_example.ini @@ -0,0 +1,9 @@ +# +# Plugin configuration file. Place the following on a separate line: +# +# library binary file name (without .so or .dll) +# component_name +# [component_name] - additional components in plugin +# +libdaemon_example +daemon_example |