diff options
| author | He Zhenxing <zhenxing.he@sun.com> | 2009-05-30 21:32:28 +0800 |
|---|---|---|
| committer | He Zhenxing <zhenxing.he@sun.com> | 2009-05-30 21:32:28 +0800 |
| commit | abf5f8dac2a0840687dc99816cbd68fb8c515e50 (patch) | |
| tree | a2efff0bf717227dce4199d6e283e4a7c112dfdd /sql/log_event.h | |
| parent | 88e84c1fbfe9b60eeb9c3d24745ee31cfe29c38b (diff) | |
| download | mariadb-git-abf5f8dac2a0840687dc99816cbd68fb8c515e50.tar.gz | |
BUG#41948 Query_log_event constructor needlessly contorted
Make the caller of Query_log_event, Execute_load_log_event
constructors and THD::binlog_query to provide the error code
instead of having the constructors to figure out the error code.
sql/log_event.cc:
Changed constructors of Query_log_event and Execute_load_log_event to accept the error code argument instead of figuring it out by itself
sql/log_event.h:
Changed constructors of Query_log_event and Execute_load_log_event to accept the error code argument
Diffstat (limited to 'sql/log_event.h')
| -rw-r--r-- | sql/log_event.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/log_event.h b/sql/log_event.h index bda53da8ab0..617db8c44fc 100644 --- a/sql/log_event.h +++ b/sql/log_event.h @@ -1623,8 +1623,7 @@ public: #ifndef MYSQL_CLIENT Query_log_event(THD* thd_arg, const char* query_arg, ulong query_length, - bool using_trans, bool suppress_use, - THD::killed_state killed_err_arg= THD::KILLED_NO_VALUE); + bool using_trans, bool suppress_use, int error); const char* get_db() { return db; } #ifdef HAVE_REPLICATION void pack_info(Protocol* protocol); @@ -2875,8 +2874,7 @@ public: uint fn_pos_end_arg, enum_load_dup_handling dup_handling_arg, bool using_trans, bool suppress_use, - THD::killed_state - killed_err_arg= THD::KILLED_NO_VALUE); + int errcode); #ifdef HAVE_REPLICATION void pack_info(Protocol* protocol); #endif /* HAVE_REPLICATION */ |