MDEV-33326 Port Spider/ODBC from ES

Revert "Deb: Stop shipping mariadb-plugin-spider separately, include in server"

This reverts commit 9945d482.

debian/control

@@ -781,8 +781,7 @@ Depends: galera-4 (>= 26.4),
          ${misc:Depends},
          ${perl:Depends},
          ${shlibs:Depends}
-Conflicts: mariadb-plugin-spider (<< ${source:Version}),
-           mariadb-server-10.0,
+Conflicts: mariadb-server-10.0,
            mariadb-server-10.1,
            mariadb-server-10.2,
            mariadb-server-10.3,
@@ -825,7 +824,6 @@ Replaces: handlersocket-mysql-5.5,
           mariadb-client-10.6,
           mariadb-client-10.7,
           mariadb-client-10.8,
-          mariadb-plugin-spider (<< ${source:Version}),
           mariadb-server-10.0,
           mariadb-server-10.1,
           mariadb-server-10.2,
@@ -1057,6 +1055,27 @@ Description: Mroonga storage engine for MariaDB server
  provides fast CJK-ready full text searching using column store.
  This package contains the Mroonga plugin for MariaDB server.
 
+Package: mariadb-plugin-spider
+Architecture: any
+Depends: mariadb-server (= ${server:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Breaks: mariadb-server-10.0,
+        mariadb-server-10.1,
+        mariadb-server-10.2,
+        mariadb-server-10.3,
+        mariadb-server-10.4
+Replaces: mariadb-server-10.0,
+          mariadb-server-10.1,
+          mariadb-server-10.2,
+          mariadb-server-10.3,
+          mariadb-server-10.4
+Description: Spider storage engine for MariaDB server
+ The Spider storage engine with built-in sharding features. It supports
+ partitioning and xa transactions, and allows tables of different MariaDB server
+ instances to be handled as if they were on the same instance. It refers to one
+ possible implementation of ISO/IEC 9075-9:2008 SQL/MED.
+
 Package: mariadb-plugin-gssapi-server
 Architecture: any
 Depends: libgssapi-krb5-2,

debian/mariadb-plugin-spider.install

+etc/mysql/mariadb.conf.d/spider.cnf
+usr/lib/mysql/plugin/ha_spider.so

debian/mariadb-server.install

@@ -5,7 +5,6 @@ debian/additions/mariadb.conf.d/50-server.cnf etc/mysql/mariadb.conf.d
 debian/additions/source_mariadb.py usr/share/apport/package-hooks
 etc/apparmor.d/usr.sbin.mariadbd
 etc/logrotate.d/mariadb
-etc/mysql/mariadb.conf.d/spider.cnf
 etc/security/user_map.conf
 lib/*/security/pam_user_map.so
 lib/systemd/system/mariadb@bootstrap.service.d/use_galera_new_cluster.conf
@@ -43,7 +42,6 @@ usr/lib/mysql/plugin/ha_blackhole.so
 usr/lib/mysql/plugin/ha_federated.so
 usr/lib/mysql/plugin/ha_federatedx.so
 usr/lib/mysql/plugin/ha_sphinx.so
-usr/lib/mysql/plugin/ha_spider.so
 usr/lib/mysql/plugin/handlersocket.so
 usr/lib/mysql/plugin/locales.so
 usr/lib/mysql/plugin/metadata_lock_info.so