upgrade C/C to 3.1

798d1a9d · Sergei Golubchik · 3416e8ac · a4effc46 · 798d1a9d · 798d1a9d
Commit 798d1a9d authored Jan 31, 2019 by Sergei Golubchik
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

libmariadb libmariadb +1 -1

mysql-test/suite/unit/suite.pm mysql-test/suite/unit/suite.pm +2 -0

plugin/auth_ed25519/CMakeLists.txt plugin/auth_ed25519/CMakeLists.txt +2 -2

No files found.
--- a/libmariadb @ a4effc46
+++ b/libmariadb @ a4effc46
-Subproject commit 34f8887af03d022416dd6593de91d0706e57f46b
+Subproject commit a4effc462ddb80b61ebb559d48b50fa8d6c0ed64
--- 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;

--- 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)