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

Manul merge

Browse Source
This commit is contained in:
2010-07-04 12:36:09 +08:00
parent 1c712120de 42eecc539a
commit fe6ab9a06b
12 changed files with 635 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/log_event.h
View File

@ -270,7 +270,8 @@ struct sql_ex_info
1 + 2 /* type, lc_time_names_number */ + \
1 + 2 /* type, charset_database_number */ + \
1 + 8 /* type, table_map_for_update */ + \
1 + 4 /* type, master_data_written */)
1 + 4 /* type, master_data_written */ + \
1 + 16 + 1 + 60/* type, user_len, user, host_len, host */)
#define MAX_LOG_EVENT_HEADER ( /* in order of Query_log_event::write */ \
LOG_EVENT_HEADER_LEN + /* write_header */ \
QUERY_HEADER_LEN + /* write_data */ \
@ -339,6 +340,8 @@ struct sql_ex_info
#define Q_MASTER_DATA_WRITTEN_CODE 10
#define Q_INVOKER 11
/* Intvar event post-header */
/* Intvar event data */
@ -1610,6 +1613,8 @@ protected:
*/
class Query_log_event: public Log_event
{
LEX_STRING user;
LEX_STRING host;
protected:
Log_event::Byte* data_buf;
public: