diff options
author | sasha@mysql.sashanet.com <> | 2001-04-10 20:56:54 -0600 |
---|---|---|
committer | sasha@mysql.sashanet.com <> | 2001-04-10 20:56:54 -0600 |
commit | 102c1945eb20afcfc727ab9cec981f4b5204ed8c (patch) | |
tree | c052d8d91d91bacc775ebdfd8e299c23e4a6e100 /sql/log_event.h | |
parent | 54b9d367f9fd32e1c57b0abd53c6299fdafad81f (diff) | |
download | mariadb-git-102c1945eb20afcfc727ab9cec981f4b5204ed8c.tar.gz |
do not log the drop internal temporary tables into the binary log
mark killed partially completed updates with an error code in binlog
stop replication if the master reports a possible partial/killed update
test partially killed update
Diffstat (limited to 'sql/log_event.h')
-rw-r--r-- | sql/log_event.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index 79186e329da..0f4945bae3c 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -136,7 +136,7 @@ public: Query_log_event(THD* thd_arg, const char* query_arg, bool using_trans=0): Log_event(thd_arg->start_time,0,1,thd_arg->server_id), data_buf(0), query(query_arg), db(thd_arg->db), q_len(thd_arg->query_length), - error_code(thd_arg->net.last_errno), + error_code(thd_arg->killed ? ER_SERVER_SHUTDOWN: thd_arg->net.last_errno), thread_id(thd_arg->thread_id), thd(thd_arg), cache_stmt(using_trans && (thd_arg->options & (OPTION_NOT_AUTO_COMMIT | OPTION_BEGIN))) |