diff options
| author | Otto Kekäläinen <otto@kekalainen.net> | 2020-04-05 18:21:29 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2020-04-14 12:08:30 +0300 |
| commit | 87a7968c23d32880920d129c0e3f467495dce10d (patch) | |
| tree | 2246a85e75588a84b4e052bb947e50290d1a9994 /debian | |
| parent | 8447edb7473c5532ecb2544ce6d00d5a868f5bd5 (diff) | |
| download | mariadb-git-87a7968c23d32880920d129c0e3f467495dce10d.tar.gz | |
MDEV-22150: Symlink and move test client plugins to client plugin path
Without this, the mtr will fail to load client plugins and the following
tests would fail:
- main.plugin_auth_qa_2
- main.plugin_auth_qa_3
- main.plugin_auth
- plugins.multiauth
- plugins.auth_ed25519
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/mariadb-test.install | 4 | ||||
| -rwxr-xr-x | debian/rules | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/debian/mariadb-test.install b/debian/mariadb-test.install index e75d41a4bb3..e02a699d10a 100644 --- a/debian/mariadb-test.install +++ b/debian/mariadb-test.install @@ -2,6 +2,9 @@ usr/bin/mariadb-client-test usr/bin/mariadb-client-test-embedded usr/bin/mariadb-test usr/bin/mariadb-test-embedded +usr/lib/*/libmariadb3/plugin/auth_test_plugin.so +usr/lib/*/libmariadb3/plugin/qa_auth_client.so +usr/lib/*/libmariadb3/plugin/qa_auth_interface.so usr/lib/mysql/plugin/adt_null.so usr/lib/mysql/plugin/auth_0x0100.so usr/lib/mysql/plugin/auth_test_plugin.so @@ -13,7 +16,6 @@ usr/lib/mysql/plugin/ha_example.so usr/lib/mysql/plugin/ha_test_sql_discovery.so usr/lib/mysql/plugin/libdaemon_example.so usr/lib/mysql/plugin/mypluglib.so -usr/lib/mysql/plugin/qa_auth_client.so usr/lib/mysql/plugin/qa_auth_interface.so usr/lib/mysql/plugin/qa_auth_server.so usr/lib/mysql/plugin/test_versioning.so diff --git a/debian/rules b/debian/rules index 3d453c55ce6..77095eaaca0 100755 --- a/debian/rules +++ b/debian/rules @@ -146,6 +146,13 @@ endif # Install libmariadbclient.a compatibility link ln -s libmariadb.a $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadbclient.a + # Symlink plugins that are used by both server and client and thus need to + # load from the libmariadb path as well + ln -s ../../../mysql/plugin/auth_test_plugin.so $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadb3/plugin/auth_test_plugin.so + ln -s ../../../mysql/plugin/qa_auth_interface.so $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadb3/plugin/qa_auth_interface.so + # Move test plugins that are only needed by the client to the libmariadb path + mv -v $(TMP)/usr/lib/mysql/plugin/qa_auth_client.so $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadb3/plugin/ + override_dh_fixperms: dh_fixperms chmod 04755 debian/mariadb-server-10.5/usr/lib/mysql/plugin/auth_pam_tool_dir/auth_pam_tool |