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

Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3

Browse Source
This commit is contained in:
Alexander Barkov
2017-07-05 17:43:32 +04:00
parent a4d9fa99ea 58dd72f18c
commit 3b9273d203
189 changed files with 3959 additions and 4286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sql/sql_class.cc
View File

@ -939,8 +939,7 @@ THD::THD(my_thread_id id, bool is_wsrep_applier)
m_internal_handler= NULL;
m_binlog_invoker= INVOKER_NONE;
memset(&invoker_user, 0, sizeof(invoker_user));
memset(&invoker_host, 0, sizeof(invoker_host));
invoker.init();
prepare_derived_at_open= FALSE;
create_tmp_table_for_derived= FALSE;
save_prep_leaf_list= FALSE;
@ -5375,8 +5374,8 @@ void THD::get_definer(LEX_USER *definer, bool role)
if (slave_thread && has_invoker())
#endif
{
definer->user= invoker_user;
definer->host= invoker_host;
definer->user= invoker.user;
definer->host= invoker.host;
definer->reset_auth();
}
else
@ -7446,4 +7445,16 @@ bool Discrete_intervals_list::append(Discrete_interval *new_interval)
DBUG_RETURN(0);
}
void AUTHID::copy(MEM_ROOT *mem_root, const LEX_CSTRING *user_name,
const LEX_CSTRING *host_name)
{
user.str= strmake_root(mem_root, user_name->str, user_name->length);
user.length= user_name->length;
host.str= strmake_root(mem_root, host_name->str, host_name->length);
host.length= host_name->length;
}
#endif /* !defined(MYSQL_CLIENT) */