database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Manual merge

Browse Source
This commit is contained in:
2010-06-27 13:51:45 +08:00
parent f8f7a704ee 899a1d694f
commit c943bc7bbb
12 changed files with 606 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_class.cc
View File

@ -1341,6 +1341,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();
}
@ -4126,6 +4127,17 @@ THD::binlog_prepare_pending_rows_event(TABLE* table, uint32 serv_id,
DBUG_RETURN(pending); /* This is the current pending event */
}
void THD::get_definer(LEX_USER *definer)
{
set_current_user_used();
#if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
if (slave_thread && variables.current_user.user.length)
*definer= variables.current_user;
else
#endif
get_default_definer(this, definer);
}
#ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION
/*
Instantiate the versions we need, we have -fno-implicit-template as