diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-08-13 23:49:10 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-08-13 23:49:10 +0400 |
| commit | c1599821a55ac4f59c5c799480a07913e1c26daa (patch) | |
| tree | 0c064252ad3959fcd53b0f06a40b98d691fe070e /sql/sql_acl.cc | |
| parent | 624dd71b9419555eca8baadc695e3376de72286f (diff) | |
| parent | c4fd167d5a740f67ee5287a9b05b5383403b9ed0 (diff) | |
| download | mariadb-git-c1599821a55ac4f59c5c799480a07913e1c26daa.tar.gz | |
Merge remote-tracking branch 'origin/10.4' into 10.5
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index e934183c1d6..6537f5ad1bc 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -4315,7 +4315,7 @@ static int replace_user_table(THD *thd, const User_table &user_table, bool handle_as_role= combo->is_role(); LEX *lex= thd->lex; TABLE *table= user_table.table(); - ACL_USER new_acl_user, *old_acl_user; + ACL_USER new_acl_user, *old_acl_user= 0; DBUG_ENTER("replace_user_table"); mysql_mutex_assert_owner(&acl_cache->lock); @@ -12650,6 +12650,7 @@ static bool send_plugin_request_packet(MPVIO_EXT *mpvio, ((st_mysql_auth *) (plugin_decl(mpvio->plugin)->info))->client_auth_plugin; DBUG_EXECUTE_IF("auth_disconnect", { DBUG_RETURN(1); }); + DBUG_EXECUTE_IF("auth_invalid_plugin", client_auth_plugin="foo/bar"; ); DBUG_ASSERT(client_auth_plugin); /* |