summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-09-10 10:04:04 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-09-10 10:04:04 +0300
commitff5ecfd335582967d76c418514a4310f6804fdaa (patch)
treeba03f320adb82398b30f63438e8cc3a5ece10be0 /debian
parentda9201dd5bfbd5df68612c33e2b087705d44bec7 (diff)
downloadmariadb-git-ff5ecfd335582967d76c418514a4310f6804fdaa.tar.gz
Correct the merge 0f83c8878dc1389212c134f65d37a43d9d248250
Re-enable some Galera tests that should have been enabled. Add client_ed25519.so to debian/libmariadb3.install; merge e47a143fc08f7114fd877ad8ee83d322f877a672 correctly. Remove a duplicated #include from wsrep_mysqld.cc.
Diffstat (limited to 'debian')
-rw-r--r--debian/libmariadb3.install1
1 files changed, 1 insertions, 0 deletions
diff --git a/debian/libmariadb3.install b/debian/libmariadb3.install
index 8636166a493..9783e7b0b01 100644
--- a/debian/libmariadb3.install
+++ b/debian/libmariadb3.install
@@ -3,3 +3,4 @@ usr/lib/mysql/plugin/client_ed25519.so
usr/lib/mysql/plugin/dialog.so
usr/lib/mysql/plugin/mysql_clear_password.so
usr/lib/mysql/plugin/sha256_password.so
+usr/lib/mysql/plugin/client_ed25519.so