database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

switch to CC 3.1

Browse Source
This commit is contained in:
Oleksandr Byelkin
2019-07-12 16:44:39 +02:00
parent 731ef75175
commit e2bbb6f5e9
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libmariadb

Submodule libmariadb updated: bce6c80138...5fa9c4615e

8
mysql-test/r/plugin_auth.result
View File

@ -42,7 +42,13 @@ connection default;
disconnect plug_con; disconnect plug_con;
## test bad credentials ## test bad credentials
ERROR 28000: Access denied for user 'plug'@'localhost' (using password: YES) 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 ## test correct default plugin
connect plug_con_rightp,localhost,plug,plug_dest,,,,,auth_test_plugin; connect plug_con_rightp,localhost,plug,plug_dest,,,,,auth_test_plugin;
connection plug_con_rightp; connection plug_con_rightp;

10
mysql-test/t/plugin_auth.test
View File

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

4
plugin/auth_ed25519/CMakeLists.txt
View File

@ -24,8 +24,8 @@ ENDIF()
MYSQL_ADD_PLUGIN(auth_ed25519 server_ed25519.c ${REF10_SOURCES} MODULE_ONLY) MYSQL_ADD_PLUGIN(auth_ed25519 server_ed25519.c ${REF10_SOURCES} MODULE_ONLY)
# client plugin and unit test ed25519-t can use the library # client plugin and unit test ed25519-t can use the library
MYSQL_ADD_PLUGIN(client_ed25519 client_ed25519.c MODULE_ONLY #MYSQL_ADD_PLUGIN(client_ed25519 client_ed25519.c MODULE_ONLY
CLIENT LINK_LIBRARIES ref10 mysys_ssl COMPONENT ClientPlugins) # CLIENT LINK_LIBRARIES ref10 mysys_ssl COMPONENT ClientPlugins)
IF(WITH_UNIT_TESTS) IF(WITH_UNIT_TESTS)
MY_ADD_TESTS(ed25519 LINK_LIBRARIES ref10 mysys_ssl) MY_ADD_TESTS(ed25519 LINK_LIBRARIES ref10 mysys_ssl)