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

Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3

Browse Source
This commit is contained in:
Alexander Barkov
2017-07-05 17:43:32 +04:00
parent a4d9fa99ea 58dd72f18c
commit 3b9273d203
189 changed files with 3959 additions and 4286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sql/sql_class.h
View File

@ -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