From ba4148698fa648aaf15aa3daea857edcdd0d52c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Sun, 26 Apr 2020 22:43:57 +0300 Subject: 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. --- debian/mariadb-plugin-spider.install | 2 +- debian/mariadb-plugin-spider.postinst | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 debian/mariadb-plugin-spider.postinst (limited to 'debian') diff --git a/debian/mariadb-plugin-spider.install b/debian/mariadb-plugin-spider.install index 89652fe2f3c..78f2c44cbd0 100644 --- a/debian/mariadb-plugin-spider.install +++ b/debian/mariadb-plugin-spider.install @@ -1,2 +1,2 @@ +etc/mysql/conf.d/spider.cnf etc/mysql/mariadb.conf.d usr/lib/mysql/plugin/ha_spider.so -usr/share/mysql/install_spider.sql diff --git a/debian/mariadb-plugin-spider.postinst b/debian/mariadb-plugin-spider.postinst deleted file mode 100644 index d4ddaa53156..00000000000 --- a/debian/mariadb-plugin-spider.postinst +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -set -e - -# Install Spider -mysql --defaults-file=/etc/mysql/debian.cnf < /usr/share/mysql/install_spider.sql || true -# Always exit with success instead of leaving dpkg in a broken state - - -#DEBHELPER# -- cgit v1.2.1