diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-01-31 22:02:12 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-02-04 16:06:31 +0100 |
| commit | 798d1a9ddf159941228ac9c452c1384197d1aef0 (patch) | |
| tree | dc02722961cac185af07495ef41d598f224d8e33 | |
| parent | 3416e8ac9a0f614846d2f6c1cc3fcb7052c53f4e (diff) | |
| download | mariadb-git-798d1a9ddf159941228ac9c452c1384197d1aef0.tar.gz | |
upgrade C/C to 3.1
| m--------- | libmariadb | 0 | ||||
| -rw-r--r-- | mysql-test/suite/unit/suite.pm | 2 | ||||
| -rw-r--r-- | plugin/auth_ed25519/CMakeLists.txt | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/libmariadb b/libmariadb -Subproject 34f8887af03d022416dd6593de91d0706e57f46 +Subproject a4effc462ddb80b61ebb559d48b50fa8d6c0ed6 diff --git a/mysql-test/suite/unit/suite.pm b/mysql-test/suite/unit/suite.pm index c8180c59240..b7a1f9ae871 100644 --- a/mysql-test/suite/unit/suite.pm +++ b/mysql-test/suite/unit/suite.pm @@ -44,6 +44,8 @@ sub start_test { my (@ctest_list)= `cd "$bin" && ctest $ctest_vs --show-only --verbose`; return "No ctest" if $?; + $ENV{MYSQL_TEST_PLUGINDIR}=$::plugindir; + my ($command, %tests, $prefix); for (@ctest_list) { chomp; diff --git a/plugin/auth_ed25519/CMakeLists.txt b/plugin/auth_ed25519/CMakeLists.txt index 73d8eeb208b..ffd2523d1af 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 mysys_ssl ref10 COMPONENT ClientPlugins) +#MYSQL_ADD_PLUGIN(client_ed25519 client_ed25519.c MODULE_ONLY +# CLIENT LINK_LIBRARIES mysys_ssl ref10 COMPONENT ClientPlugins) IF(WITH_UNIT_TESTS) MY_ADD_TESTS(ed25519 LINK_LIBRARIES mysys ref10) |