mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Manual merge
This commit is contained in:
@ -631,7 +631,7 @@ THD::THD()
|
||||
thr_lock_info_init(&lock_info); /* safety: will be reset after start */
|
||||
|
||||
m_internal_handler= NULL;
|
||||
current_user_used= FALSE;
|
||||
m_binlog_invoker= FALSE;
|
||||
memset(&invoker_user, 0, sizeof(invoker_user));
|
||||
memset(&invoker_host, 0, sizeof(invoker_host));
|
||||
}
|
||||
@ -1336,7 +1336,7 @@ void THD::cleanup_after_query()
|
||||
where= THD::DEFAULT_WHERE;
|
||||
/* reset table map for multi-table update */
|
||||
table_map_for_update= 0;
|
||||
clean_current_user_used();
|
||||
m_binlog_invoker= FALSE;
|
||||
}
|
||||
|
||||
|
||||
@ -3467,7 +3467,7 @@ void THD::leave_locked_tables_mode()
|
||||
|
||||
void THD::get_definer(LEX_USER *definer)
|
||||
{
|
||||
set_current_user_used();
|
||||
binlog_invoker();
|
||||
#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
|
||||
if (slave_thread && has_invoker())
|
||||
{
|
||||
|
Reference in New Issue
Block a user