diff options
| author | unknown <Li-Bing.Song@sun.com> | 2010-07-04 12:36:09 +0800 |
|---|---|---|
| committer | unknown <Li-Bing.Song@sun.com> | 2010-07-04 12:36:09 +0800 |
| commit | 43ef6da6ef00d9b3a5da218df1629115c1f47b9f (patch) | |
| tree | 4c324a2eff6dec16929d5e86816393b3080c54ca /sql/log_event.h | |
| parent | 878bf8d1b0850fc84d8ba3832569ee934adce299 (diff) | |
| parent | 1a17d7e8079b4cbda51c311eceaea38b407556f3 (diff) | |
| download | mariadb-git-43ef6da6ef00d9b3a5da218df1629115c1f47b9f.tar.gz | |
Manul merge
Diffstat (limited to 'sql/log_event.h')
| -rw-r--r-- | sql/log_event.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index bd95c74b6c5..688bc3a9aa6 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -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: |