diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-07-05 17:43:32 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-07-05 17:43:32 +0400 |
| commit | 3b9273d20334f95b85047058ae978615b61a57ed (patch) | |
| tree | 78ce9901370c84f6e5f6d1b07e6cc487a6fee7bb /sql/sql_class.h | |
| parent | a4d9fa99ea25fa87f7a8ecf36579ec1585d1c397 (diff) | |
| parent | 58dd72f18cca5e706a5bd0dfcf3e22aba9bb8448 (diff) | |
| download | mariadb-git-3b9273d20334f95b85047058ae978615b61a57ed.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 4f2819375c7..db81fa85264 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -521,7 +521,8 @@ typedef struct system_variables uint dynamic_variables_size; /* how many bytes are in use */ ulonglong max_heap_table_size; - ulonglong tmp_table_size; + ulonglong tmp_memory_table_size; + ulonglong tmp_disk_table_size; ulonglong long_query_time; ulonglong max_statement_time; ulonglong optimizer_switch; @@ -4083,12 +4084,12 @@ public: void get_definer(LEX_USER *definer, bool role); void set_invoker(const LEX_CSTRING *user, const LEX_CSTRING *host) { - invoker_user= *user; - invoker_host= *host; + invoker.user= *user; + invoker.host= *host; } - LEX_CSTRING get_invoker_user() { return invoker_user; } - LEX_CSTRING get_invoker_host() { return invoker_host; } - bool has_invoker() { return invoker_user.length > 0; } + LEX_CSTRING get_invoker_user() { return invoker.user; } + LEX_CSTRING get_invoker_host() { return invoker.host; } + bool has_invoker() { return invoker.user.length > 0; } void print_aborted_warning(uint threshold, const char *reason) { @@ -4187,8 +4188,7 @@ private: TRIGGER or VIEW statements or current user in account management statements if it is not NULL. */ - LEX_CSTRING invoker_user; - LEX_CSTRING invoker_host; + AUTHID invoker; public: #ifndef EMBEDDED_LIBRARY |