diff options
| author | unknown <hf@genie.(none)> | 2003-03-31 13:42:37 +0500 |
|---|---|---|
| committer | unknown <hf@genie.(none)> | 2003-03-31 13:42:37 +0500 |
| commit | c0160bb59126e262921a949545b64939b3d2c5ee (patch) | |
| tree | 44c6540205ef4663c8f970b862737aeeb1fe5ba8 /sql/log_event.cc | |
| parent | cc0f1f15cddb29386ff691adc1712369ee8cee0c (diff) | |
| parent | 3814f2a8edf71a964cdbd8c965790d7216eff9fa (diff) | |
| download | mariadb-git-c0160bb59126e262921a949545b64939b3d2c5ee.tar.gz | |
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into genie.(none):/home/hf/work/mysql-5.0.kil
include/mysql_com.h:
Auto merged
myisam/mi_check.c:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/lex.h:
Auto merged
sql/lock.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_repl.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/share/swedish/errmsg.txt:
Auto merged
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 5e3340b4cf7..5132388224f 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(thd_arg->killed ? ER_SERVER_SHUTDOWN: thd_arg->net.last_errno), + error_code((int)thd_arg->killed ? (int)thd_arg->killed : thd_arg->net.last_errno), thread_id(thd_arg->thread_id) { time_t end_time; |