diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-26 09:47:28 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-26 09:47:28 +0300 |
| commit | 365cd08345ab759308cfcac663a2a5880c0c33cb (patch) | |
| tree | 53ef588edc5e01bd456784c12f1770f83a17cfb5 /sql/sql_acl.cc | |
| parent | 675716e1cb34e29f7d3f46aac9a93adf02ac0851 (diff) | |
| parent | 1dea7f79779d13695876b84ebecbf41c13d845cb (diff) | |
| download | mariadb-git-365cd08345ab759308cfcac663a2a5880c0c33cb.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 5f5f5428dad..71b5defeef8 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -13904,7 +13904,12 @@ static int server_mpvio_read_packet(MYSQL_PLUGIN_VIO *param, uchar **buf) done: if (set_user_salt_if_needed(mpvio->acl_user, mpvio->curr_auth, mpvio->plugin)) + { + ai->thd->clear_error(); // authenticating user should not see these errors + my_error(ER_ACCESS_DENIED_ERROR, MYF(0), ai->thd->security_ctx->user, + ai->thd->security_ctx->host_or_ip, ER_THD(ai->thd, ER_YES)); goto err; + } ai->user_name= ai->thd->security_ctx->user; ai->user_name_length= (uint) strlen(ai->user_name); |