From 0969368d13772f8a61ddefb53efd64d4cf42d9d3 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 10 Apr 2001 20:56:54 -0600 Subject: 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 mysql-test/r/rpl000001.result: updated result mysql-test/r/rpl000012.result: updated result mysql-test/t/rpl000001.test: test handing a killed partial update mysql-test/t/rpl000012.test: test temporary table replication more thoroughly sql/log_event.h: mark killed partially completed updates with an error code BitKeeper/etc/ignore: Added bdb/btree/btree_auto.c bdb/build_vxworks/db_int.h bdb/build_win32/db_int.h bdb/build_win32/include.tcl bdb/build_win32/libdb.rc bdb/db/crdel_auto.c bdb/db/db_auto.c bdb/dist/config.hin to the ignore list sql/slave.cc: stop replication if the master reports a possible partial/killed update sql/sql_base.cc: do not log the drop internal temporary tables into the binary log --- sql/log_event.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/log_event.h') 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))) -- cgit v1.2.1