database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge of mysql-5.1-bugteam into mysql-trunk-merge.

Browse Source
This commit is contained in:
Davi Arnaut
2010-06-28 19:18:22 -03:00
parent 7399475579 bfd3b7a109
commit 3a57c8d1d9
12 changed files with 21 additions and 605 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_class.h
View File

@ -473,7 +473,6 @@ typedef struct system_variables
double long_query_time_double;
LEX_USER current_user;
} SV;
@ -2717,10 +2716,6 @@ public:
}
void leave_locked_tables_mode();
int decide_logging_format(TABLE_LIST *tables);
void set_current_user_used() { current_user_used= TRUE; }
bool is_current_user_used() { return current_user_used; }
void clean_current_user_used() { current_user_used= FALSE; }
void get_definer(LEX_USER *definer);
private:
/** The current internal error handler for this thread, or NULL. */
@ -2743,8 +2738,6 @@ private:
MEM_ROOT main_mem_root;
Warning_info main_warning_info;
Diagnostics_area main_da;
bool current_user_used;
};