switch to CC 3.1

libmariadb @ 5fa9c461

-Subproject commit bce6c8013805f203b38e52c979b22b3141334f3c
+Subproject commit 5fa9c4615e71b696b84b4c77aefa197466526a13

mysql-test/r/plugin_auth.result

@@ -42,7 +42,13 @@ connection default;
 disconnect plug_con;
 ## test bad credentials
 ERROR 28000: Access denied for user 'plug'@'localhost' (using password: YES)
-## test bad default plugin : should get CR_AUTH_PLUGIN_CANNOT_LOAD
+## test bad default plugin : nothing bad happens, as that plugin was't required by the server
+connect plug_con_wrongp,localhost,plug,plug_dest,,,,,wrong_plugin_name;
+select USER(),CURRENT_USER();
+USER()	CURRENT_USER()
+plug@localhost	plug_dest@%
+connection default;
+disconnect plug_con_wrongp;
 ## test correct default plugin
 connect plug_con_rightp,localhost,plug,plug_dest,,,,,auth_test_plugin;
 connection plug_con_rightp;

mysql-test/t/plugin_auth.test

@@ -45,13 +45,11 @@ disconnect plug_con;
 connect(plug_con,localhost,plug,bad_credentials);
 --enable_query_log
 
---echo ## test bad default plugin : should get CR_AUTH_PLUGIN_CANNOT_LOAD
---disable_result_log
---disable_query_log
---error 2059
+--echo ## test bad default plugin : nothing bad happens, as that plugin was't required by the server
 connect(plug_con_wrongp,localhost,plug,plug_dest,,,,,wrong_plugin_name);
---enable_query_log
---enable_result_log
+select USER(),CURRENT_USER();
+connection default;
+disconnect plug_con_wrongp;
 
 --echo ## test correct default plugin
 connect(plug_con_rightp,localhost,plug,plug_dest,,,,,auth_test_plugin);

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)