database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

10.0-base merge (roles)

Browse Source
This commit is contained in:
Sergei Golubchik
2013-10-29 15:08:44 +01:00
parent 7dc48ae327 fef4166990
commit 0fdb3bcfdb
248 changed files with 10725 additions and 1899 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_class.cc
View File

@@ -1001,7 +1001,7 @@ THD::THD()
thr_lock_info_init(&lock_info); /* safety: will be reset after start */
m_internal_handler= NULL;
m_binlog_invoker= FALSE;
m_binlog_invoker= INVOKER_NONE;
arena_for_cached_items= 0;
memset(&invoker_user, 0, sizeof(invoker_user));
memset(&invoker_host, 0, sizeof(invoker_host));
@@ -2025,7 +2025,7 @@ void THD::cleanup_after_query()
where= THD::DEFAULT_WHERE;
/* reset table map for multi-table update */
table_map_for_update= 0;
m_binlog_invoker= FALSE;
m_binlog_invoker= INVOKER_NONE;
#ifndef EMBEDDED_LIBRARY
if (rli_slave)
@@ -3782,7 +3782,7 @@ void Security_context::init()
{
host= user= ip= external_user= 0;
host_or_ip= "connecting host";
priv_user[0]= priv_host[0]= proxy_user[0]= '\0';
priv_user[0]= priv_host[0]= proxy_user[0]= priv_role[0]= '\0';
master_access= 0;
#ifndef NO_EMBEDDED_ACCESS_CHECKS
db_access= NO_ACCESS;
@@ -4652,9 +4652,9 @@ void THD::leave_locked_tables_mode()
locked_tables_mode= LTM_NONE;
}
void THD::get_definer(LEX_USER *definer)
void THD::get_definer(LEX_USER *definer, bool role)
{
binlog_invoker();
binlog_invoker(role);
#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
if (slave_thread && has_invoker())
{
@@ -4666,7 +4666,7 @@ void THD::get_definer(LEX_USER *definer)
}
else
#endif
get_default_definer(this, definer);
get_default_definer(this, definer, role);
}