diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-07-19 15:36:44 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-07-19 15:36:44 +0200 |
| commit | 0a9a8f68aa5ca1e5cef1720ece3925233758cbb7 (patch) | |
| tree | 8bc42816fced45385afe7925921d96ba3ded91d7 | |
| parent | ef44ec4afaa70521789dbb7886a0a21da64a569e (diff) | |
| download | mariadb-git-bb-10.3-MDEV-20055.tar.gz | |
switch to CC 3.1bb-10.3-MDEV-20055
| m--------- | libmariadb | 0 | ||||
| -rw-r--r-- | mysql-test/main/plugin_auth.result | 8 | ||||
| -rw-r--r-- | mysql-test/main/plugin_auth.test | 10 | ||||
| -rw-r--r-- | plugin/auth_ed25519/CMakeLists.txt | 4 |
4 files changed, 13 insertions, 9 deletions
diff --git a/libmariadb b/libmariadb -Subproject bce6c8013805f203b38e52c979b22b3141334f3 +Subproject 5fa9c4615e71b696b84b4c77aefa197466526a1 diff --git a/mysql-test/main/plugin_auth.result b/mysql-test/main/plugin_auth.result index e470cc010c0..eeb65187fea 100644 --- a/mysql-test/main/plugin_auth.result +++ b/mysql-test/main/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; diff --git a/mysql-test/main/plugin_auth.test b/mysql-test/main/plugin_auth.test index c3c18b7e427..1700a755492 100644 --- a/mysql-test/main/plugin_auth.test +++ b/mysql-test/main/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); diff --git a/plugin/auth_ed25519/CMakeLists.txt b/plugin/auth_ed25519/CMakeLists.txt index ff6651c528d..1a3d5cc4bce 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 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) |