diff options
| author | Tuukka Pasanen <tuukka.pasanen@ilmi.fi> | 2022-09-07 16:05:09 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-07 14:05:09 +0100 |
| commit | 04899d6d9167acc2132ee86e011dcdc026f73d51 (patch) | |
| tree | 426db74b90d1fdb8937e81823ceea93f8bcbed27 | |
| parent | ac49b7a845f5b5de30d1266879a4c584f9d7c914 (diff) | |
| download | mariadb-git-04899d6d9167acc2132ee86e011dcdc026f73d51.tar.gz | |
MDEV-28605: Change wrong plugin config installation location (#2160)
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.
| -rw-r--r-- | debian/mariadb-plugin-gssapi-server.install | 2 | ||||
| -rw-r--r-- | debian/mariadb-plugin-oqgraph.install | 2 | ||||
| -rw-r--r-- | debian/mariadb-plugin-rocksdb.install | 2 | ||||
| -rw-r--r-- | debian/mariadb-plugin-tokudb.install | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/debian/mariadb-plugin-gssapi-server.install b/debian/mariadb-plugin-gssapi-server.install index 537f459d2d2..c6d9f8b32a5 100644 --- 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 index 5e2a892d9e9..cf2b8db8926 100644 --- 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 index 403c7f291b6..d178c5ce574 100644 --- 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 index e8925c1d4f1..e0b2464ee48 100644 --- 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 |