summaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-07-22 17:37:04 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2019-07-22 17:37:04 +0300
commit70b226d96698502281cd93581d68f013dd1865bf (patch)
tree3dd1775c45a0295ca15818c67a9d98e6ba1f4502 /plugin
parentabeacb9c8280416ee0bf91f4bda414430a565ad5 (diff)
parent3bcda8ad5f69538379ef0fed7715f23c1cf04380 (diff)
downloadmariadb-git-70b226d96698502281cd93581d68f013dd1865bf.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'plugin')
-rw-r--r--plugin/auth_ed25519/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugin/auth_ed25519/CMakeLists.txt b/plugin/auth_ed25519/CMakeLists.txt
index ff6651c528d..1a3d5cc4bce 100644
--- a/plugin/auth_ed25519/CMakeLists.txt
+++ b/plugin/auth_ed25519/CMakeLists.txt
@@ -24,8 +24,8 @@ ENDIF()
MYSQL_ADD_PLUGIN(auth_ed25519 server_ed25519.c ${REF10_SOURCES} MODULE_ONLY)
# client plugin and unit test ed25519-t can use the library
-MYSQL_ADD_PLUGIN(client_ed25519 client_ed25519.c MODULE_ONLY
- CLIENT LINK_LIBRARIES ref10 mysys_ssl COMPONENT ClientPlugins)
+#MYSQL_ADD_PLUGIN(client_ed25519 client_ed25519.c MODULE_ONLY
+# CLIENT LINK_LIBRARIES ref10 mysys_ssl COMPONENT ClientPlugins)
IF(WITH_UNIT_TESTS)
MY_ADD_TESTS(ed25519 LINK_LIBRARIES ref10 mysys_ssl)