diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-10-29 15:08:44 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-10-29 15:08:44 +0100 |
| commit | 0fdb3bcfdbfa5d7cad28adc1c0f7c0958cdab2e0 (patch) | |
| tree | 7d6a1d36b975e2b1bb8d9ffd3b7511ec0694349e /sql/sql_class.cc | |
| parent | 7dc48ae327ad27205dffe0cec16b445d01529f84 (diff) | |
| parent | fef416699009b78366d9eec937c01822b531f518 (diff) | |
| download | mariadb-git-0fdb3bcfdbfa5d7cad28adc1c0f7c0958cdab2e0.tar.gz | |
10.0-base merge (roles)
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 31ce21509a9..1fe55d6af99 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -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); } |