diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-06-10 16:26:13 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-06-12 01:17:57 +0200 |
| commit | 07d1c8567cbfe94398a9857c47fb9919cad42651 (patch) | |
| tree | bb7b6b4496f9919ed4fc0eda62252d567628daa3 /storage | |
| parent | d3f4748254f96a2e9f30674ed7fcd40001f75b21 (diff) | |
| download | mariadb-git-07d1c8567cbfe94398a9857c47fb9919cad42651.tar.gz | |
post-fix for #1504
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/spider/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | storage/spider/spider.cnf | 5 |
2 files changed, 13 insertions, 2 deletions
diff --git a/storage/spider/CMakeLists.txt b/storage/spider/CMakeLists.txt index 2c3573c3709..397478bfc40 100644 --- a/storage/spider/CMakeLists.txt +++ b/storage/spider/CMakeLists.txt @@ -50,8 +50,14 @@ ELSEIF(PLUGIN_PARTITION MATCHES "^NO$") ELSE() INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/spider/hs_client) - MYSQL_ADD_PLUGIN(spider ${SPIDER_SOURCES} - STORAGE_ENGINE COMPONENT spider-engine MODULE_ONLY MODULE_OUTPUT_NAME "ha_spider") + IF(DEB) + SET(extra_options COMPONENT spider-engine) + ELSE() + SET(extra_options CONFIG spider.cnf) + ENDIF() + + MYSQL_ADD_PLUGIN(spider ${SPIDER_SOURCES} ${extra_options} + STORAGE_ENGINE MODULE_ONLY) IF(NOT TARGET spider) RETURN() ENDIF() diff --git a/storage/spider/spider.cnf b/storage/spider/spider.cnf new file mode 100644 index 00000000000..2ee546962d6 --- /dev/null +++ b/storage/spider/spider.cnf @@ -0,0 +1,5 @@ +[mariadb] +# +# uncomment the following line to enable SPIDER storage engine +# +#plugin-load-add=ha_spider.so |