diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-28 19:18:22 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-28 19:18:22 -0300 |
| commit | 3a57c8d1d98b875bb09f81afcc38d4a4c14327d0 (patch) | |
| tree | b9e182c75ad72c35c0a5efdc3168a87174beba66 /sql/log_event.h | |
| parent | 73994755791497aeff01e64bf075ab254fe4b221 (diff) | |
| parent | bfd3b7a109f567ebbbe0f17a6a804c3d42285a89 (diff) | |
| download | mariadb-git-3a57c8d1d98b875bb09f81afcc38d4a4c14327d0.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'sql/log_event.h')
| -rw-r--r-- | sql/log_event.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index 688bc3a9aa6..bd95c74b6c5 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -270,8 +270,7 @@ 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 + 16 + 1 + 60/* type, user_len, user, host_len, host */) + 1 + 4 /* type, master_data_written */) #define MAX_LOG_EVENT_HEADER ( /* in order of Query_log_event::write */ \ LOG_EVENT_HEADER_LEN + /* write_header */ \ QUERY_HEADER_LEN + /* write_data */ \ @@ -340,8 +339,6 @@ struct sql_ex_info #define Q_MASTER_DATA_WRITTEN_CODE 10 -#define Q_INVOKER 11 - /* Intvar event post-header */ /* Intvar event data */ @@ -1613,8 +1610,6 @@ protected: */ class Query_log_event: public Log_event { - LEX_STRING user; - LEX_STRING host; protected: Log_event::Byte* data_buf; public: |