diff options
| author | unknown <hf@deer.mysql.r18.ru> | 2003-04-08 19:18:33 +0500 |
|---|---|---|
| committer | unknown <hf@deer.mysql.r18.ru> | 2003-04-08 19:18:33 +0500 |
| commit | 131d90001f2eca14d3497207b57fcd484c3f8927 (patch) | |
| tree | 295ae18e0819b1fd8547ac14b570335446f7353a /sql/log_event.cc | |
| parent | 21f1b11fa8949feda9fe7147725e78161d344b04 (diff) | |
| download | mariadb-git-131d90001f2eca14d3497207b57fcd484c3f8927.tar.gz | |
SCRUM
two KILL versions
code trimming with headquarter's suggestions
myisam/mi_check.c:
killed_ptr function changed backward
myisam/myisamchk.c:
killed_ptr function changed backward
myisam/myisamdef.h:
killed_ptr function changed backward
myisam/sort.c:
killed_ptr function changed backward
sql/ha_myisam.cc:
killed_ptr function changed backward
sql/lock.cc:
error sending trimmed
sql/log_event.cc:
error sending trimmed
sql/records.cc:
error sending trimmed
sql/slave.cc:
error sending trimmed
sql/sql_class.h:
inline functions to send right message about killing added
sql/sql_delete.cc:
error sending trimmed
sql/sql_load.cc:
error sending trimmed
sql/sql_parse.cc:
error sending trimmed
sql/sql_prepare.cc:
error sending trimmed
sql/sql_select.cc:
error sending trimmed
sql/sql_table.cc:
error sending trimmed
sql/sql_update.cc:
error sending trimmed
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 5132388224f..b533ddb126a 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -779,7 +779,7 @@ Query_log_event::Query_log_event(THD* thd_arg, const char* query_arg, 0 : LOG_EVENT_THREAD_SPECIFIC_F, using_trans), data_buf(0), query(query_arg), db(thd_arg->db), q_len((uint32) query_length), - error_code((int)thd_arg->killed ? (int)thd_arg->killed : thd_arg->net.last_errno), + error_code(thd_arg->killed != THD::NOT_KILLED ? thd->killed_errno() : thd_arg->net.last_errno), thread_id(thd_arg->thread_id) { time_t end_time; |