Skip to content

Commit cc0205c

Browse files
ottokvaintroub
authored andcommitted
MDEV-19917: Install Spider with a simple spider.cnf
To install Spider one can simply drop a /etc/mysql/conf.d/spider.cnf like [mariadb] plugin-load-add=ha_spider.so This is automatically generated and installed when plugin is correctly registered to plugin.cmake with its own component name. Many other plugins such as Connect and RocksDB install in the same way. This solved MDEV-19917 as the mere adding and removing of spider.cnf automatically installs and uninstalls it. Remove the overly complex and uncecessary install.sql from Spider, if should not be needed in modern times anymore. With this change there is no need for a uninstall.sql either.
1 parent aaaf005 commit cc0205c

File tree

4 files changed

+3
-58
lines changed

4 files changed

+3
-58
lines changed

debian/mariadb-plugin-spider.install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1+
etc/mysql/conf.d/spider.cnf etc/mysql/mariadb.conf.d
12
usr/lib/mysql/plugin/ha_spider.so
2-
usr/share/mysql/install_spider.sql

debian/mariadb-plugin-spider.postinst

Lines changed: 0 additions & 10 deletions
This file was deleted.

storage/spider/CMakeLists.txt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,8 @@ ELSEIF(PLUGIN_PARTITION MATCHES "^NO$")
5050
ELSE()
5151
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/spider/hs_client)
5252

53-
INSTALL(FILES
54-
${CMAKE_SOURCE_DIR}/storage/spider/scripts/install_spider.sql
55-
DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
56-
)
57-
MYSQL_ADD_PLUGIN(spider ${SPIDER_SOURCES} STORAGE_ENGINE MODULE_ONLY MODULE_OUTPUT_NAME "ha_spider")
53+
MYSQL_ADD_PLUGIN(spider ${SPIDER_SOURCES}
54+
STORAGE_ENGINE COMPONENT spider-engine MODULE_ONLY MODULE_OUTPUT_NAME "ha_spider")
5855
IF(NOT TARGET spider)
5956
RETURN()
6057
ENDIF()

storage/spider/scripts/install_spider.sql

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)