diff options
| author | unknown <sasha@mysql.sashanet.com> | 2000-09-29 17:20:26 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2000-09-29 17:20:26 -0600 |
| commit | e52e3167c79d874628c47a50d8c8e0210a263085 (patch) | |
| tree | 3530dd1027b626d08c49a4bd8d57ba24d8424c45 /sql/log_event.h | |
| parent | 9ca5f114eade50b97308f711824fcfacd2135b72 (diff) | |
| download | mariadb-git-e52e3167c79d874628c47a50d8c8e0210a263085.tar.gz | |
bug fixes in server-id, moved replication functionality to
sql_repl.* will push this one, since the replication code now works
repl-tests/test-dump/run.test:
added slave/master reset
sql/Makefile.am:
added sql_repl.*
sql/log_event.cc:
moved #defines to log_event.h
sql/log_event.h:
moved #defines from log_event.cc
sql/mysql_priv.h:
added LOCK_server_id
sql/mysqlbinlog.cc:
added server id
sql/mysqld.cc:
added mutex_init for LOCK_server_id
sql/slave.cc:
added server_id to COM_BINLOG_DUMP
sql/sql_base.cc:
moved replication code to sql_repl.*
sql/sql_parse.cc:
moved replication code to sql_repl.*
Diffstat (limited to 'sql/log_event.h')
| -rw-r--r-- | sql/log_event.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index 8cade92ad27..871258885cf 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -30,6 +30,18 @@ #define LOG_EVENT_OFFSET 4 #define BINLOG_VERSION 1 +#define LOG_EVENT_HEADER_LEN 13 +#define QUERY_HEADER_LEN (sizeof(uint32) + sizeof(uint32) + sizeof(uchar)) +#define LOAD_HEADER_LEN (sizeof(uint32) + sizeof(uint32) + \ + + sizeof(uint32) + 2 + sizeof(uint32)) +#define EVENT_LEN_OFFSET 9 +#define EVENT_TYPE_OFFSET 4 +#define MAX_EVENT_LEN 4*1024*1024 +#define QUERY_EVENT_OVERHEAD LOG_EVENT_HEADER_LEN+QUERY_HEADER_LEN +#define ROTATE_EVENT_OVERHEAD LOG_EVENT_HEADER_LEN +#define LOAD_EVENT_OVERHEAD (LOG_EVENT_HEADER_LEN+LOAD_HEADER_LEN+sizeof(sql_ex_info)) + + enum Log_event_type { START_EVENT = 1, QUERY_EVENT =2, STOP_EVENT=3, ROTATE_EVENT = 4, INTVAR_EVENT=5, LOAD_EVENT=6}; @@ -101,7 +113,7 @@ public: #if !defined(MYSQL_CLIENT) THD* thd; Query_log_event(THD* thd_arg, const char* query_arg): - Log_event(thd_arg->start_time,0,0,thd->server_id), data_buf(0), + Log_event(thd_arg->start_time,0,0,thd_arg->server_id), data_buf(0), query(query_arg), db(thd_arg->db), q_len(thd_arg->query_length), thread_id(thd_arg->thread_id), thd(thd_arg) { |