MDEV-28605: Change wrong plugin config installation location (#2160)

illuusio · web-flow · commit 04899d6d9167 · 2022-09-07T14:05:09.000+01:00
Preset include directory for configuration files below MariaDB 10.5 is
/etc/mysql/conf.d

Change installation location wrong plugin installation location from
/etc/mysql/mariadb.d to default include directory /etc/mysql/conf.d.
Change makes gssapi-server, oqgraph, rocksdb and tokudb plugins
loading work after installation

NOTE TO MERGERS: This commit should be upstream to MariaDB 10.4 only!
Merging to MariaDB 10.5 and above leads to major problems.
diff --git a/debian/mariadb-plugin-gssapi-server.install b/debian/mariadb-plugin-gssapi-server.install
@@ -1,2 +1,2 @@
-etc/mysql/conf.d/auth_gssapi.cnf etc/mysql/mariadb.conf.d
+etc/mysql/conf.d/auth_gssapi.cnf
 usr/lib/mysql/plugin/auth_gssapi.so
diff --git a/debian/mariadb-plugin-oqgraph.install b/debian/mariadb-plugin-oqgraph.install
@@ -1,2 +1,2 @@
-etc/mysql/conf.d/oqgraph.cnf etc/mysql/mariadb.conf.d
+etc/mysql/conf.d/oqgraph.cnf
 usr/lib/mysql/plugin/ha_oqgraph.so
diff --git a/debian/mariadb-plugin-rocksdb.install b/debian/mariadb-plugin-rocksdb.install
@@ -1,4 +1,4 @@
-etc/mysql/conf.d/rocksdb.cnf etc/mysql/mariadb.conf.d
+etc/mysql/conf.d/rocksdb.cnf
 usr/bin/myrocks_hotbackup
 usr/bin/mysql_ldb
 usr/bin/sst_dump
diff --git a/debian/mariadb-plugin-tokudb.install b/debian/mariadb-plugin-tokudb.install
@@ -1,4 +1,4 @@
-etc/mysql/conf.d/tokudb.cnf etc/mysql/mariadb.conf.d
+etc/mysql/conf.d/tokudb.cnf
 etc/systemd/system/mariadb.service.d/tokudb.conf
 usr/bin/tokuft_logprint
 usr/bin/tokuftdump

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-etc/mysql/conf.d/auth_gssapi.cnf etc/mysql/mariadb.conf.d`
	`1`	`+etc/mysql/conf.d/auth_gssapi.cnf`
`2`	`2`	`usr/lib/mysql/plugin/auth_gssapi.so`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-etc/mysql/conf.d/oqgraph.cnf etc/mysql/mariadb.conf.d`
	`1`	`+etc/mysql/conf.d/oqgraph.cnf`
`2`	`2`	`usr/lib/mysql/plugin/ha_oqgraph.so`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-etc/mysql/conf.d/rocksdb.cnf etc/mysql/mariadb.conf.d`
	`1`	`+etc/mysql/conf.d/rocksdb.cnf`
`2`	`2`	`usr/bin/myrocks_hotbackup`
`3`	`3`	`usr/bin/mysql_ldb`
`4`	`4`	`usr/bin/sst_dump`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-etc/mysql/conf.d/tokudb.cnf etc/mysql/mariadb.conf.d`
	`1`	`+etc/mysql/conf.d/tokudb.cnf`
`2`	`2`	`etc/systemd/system/mariadb.service.d/tokudb.conf`
`3`	`3`	`usr/bin/tokuft_logprint`
`4`	`4`	`usr/bin/tokuftdump`