Skip to content
Permalink
Browse files

switch to CC 3.1

  • Loading branch information...
Oleksandr Byelkin
Oleksandr Byelkin committed Jul 12, 2019
1 parent 731ef75 commit e2bbb6f5e9b766d4ab91bcdef895414bedd00bc4
Showing with 14 additions and 10 deletions.
  1. +1 −1 libmariadb
  2. +7 −1 mysql-test/r/plugin_auth.result
  3. +4 −6 mysql-test/t/plugin_auth.test
  4. +2 −2 plugin/auth_ed25519/CMakeLists.txt
Submodule libmariadb updated 107 files
@@ -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;
@@ -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);
@@ -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)

0 comments on commit e2bbb6f

Please sign in to comment.
You can’t perform that action at this time.