diff options
| author | monty@narttu.mysql.fi <> | 2003-11-04 09:40:36 +0200 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2003-11-04 09:40:36 +0200 |
| commit | 4e4725377d27ff0101788fd7ed89670614ed8294 (patch) | |
| tree | d387df22d5d3ffed50ecd8620f1eb18bc61ead7e /sql/log_event.h | |
| parent | 30af2d0f49a203ae4fb97194e899fa5e13a42c1d (diff) | |
| parent | e1e82a4e00dd2cee2ff56accdd3fdbd5afeadb6a (diff) | |
| download | mariadb-git-4e4725377d27ff0101788fd7ed89670614ed8294.tar.gz | |
Merge with 4.0
Diffstat (limited to 'sql/log_event.h')
| -rw-r--r-- | sql/log_event.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index 8ba5d0379a0..6cc8a7ca06d 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -455,6 +455,13 @@ public: uint32 db_len; uint16 error_code; ulong thread_id; + /* + For events created by Query_log_event::exec_event (and + Load_log_event::exec_event()) we need the *original* thread id, to be able + to log the event with the original (=master's) thread id (fix for + BUG#1686). + */ + ulong slave_proxy_id; #ifndef MYSQL_CLIENT Query_log_event(THD* thd_arg, const char* query_arg, ulong query_length, @@ -543,6 +550,7 @@ protected: public: ulong thread_id; + ulong slave_proxy_id; uint32 table_name_len; uint32 db_len; uint32 fname_len; |