diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-10-25 14:26:21 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-10-25 14:26:21 +0200 |
| commit | a12de3d00d6d5cb6a795c5671bf42c39745c49cc (patch) | |
| tree | abd2e51e16157e63e08187eee33536104f95b5a5 /sql/sql_class.cc | |
| parent | ae6801eb23cf91c83db0727784e5037e03e2df2d (diff) | |
| parent | 1eb1bea003f0966a08852668133981691e017f26 (diff) | |
| download | mariadb-git-a12de3d00d6d5cb6a795c5671bf42c39745c49cc.tar.gz | |
Merge from mysql-5.5-bugteam to mysql-5.5-runtime
No conflicts
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index da61c67f1c8..c848d686299 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -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)); } @@ -1375,7 +1375,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; } @@ -3506,7 +3506,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()) { |