diff options
| author | mats@kindahl-laptop.dnsalias.net <> | 2007-06-09 07:19:37 +0200 |
|---|---|---|
| committer | mats@kindahl-laptop.dnsalias.net <> | 2007-06-09 07:19:37 +0200 |
| commit | 9094e97aed8536e628cb6c5a81b79ecc6521be7a (patch) | |
| tree | cdc21b3b7f0f7811d04f8bafebcee2697b8a7d3b /sql/rpl_rli.h | |
| parent | bba84e754d61918dd147f1926b338f5f82ee3150 (diff) | |
| download | mariadb-git-9094e97aed8536e628cb6c5a81b79ecc6521be7a.tar.gz | |
BUG#24954 (Last_errno and Last_error not set after master_retry_count was reached):
Adding new fields Last_{IO,SQL}_Errno and Last_{IO,SQL}_Error to output
of SHOW SLAVE STATUS to hold errors from I/O and SQL thread respectively.
Old fields Last_Error and Last_Errno are aliases for Last_SQL_Error and
Last_SQL_Errno respectively.
Fields are added last to output of SHOW SLAVE STATUS to allow old applications
to use the same positional arguments into the row, while allowing new
application to benefit from the added information.
In addition, some new error codes are added (especially for the I/O
thread) to be able to provide sensible error message.
Diffstat (limited to 'sql/rpl_rli.h')
| -rw-r--r-- | sql/rpl_rli.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sql/rpl_rli.h b/sql/rpl_rli.h index d737055baf2..2761f3f5db7 100644 --- a/sql/rpl_rli.h +++ b/sql/rpl_rli.h @@ -20,7 +20,7 @@ #define MAX_SLAVE_ERRMSG 1024 #include "rpl_tblmap.h" - +#include "rpl_reporting.h" /**************************************************************************** @@ -48,7 +48,7 @@ *****************************************************************************/ -typedef struct st_relay_log_info +typedef struct st_relay_log_info : public Slave_reporting_capability { /* If flag set, then rli does not store its state in any info file. @@ -57,7 +57,7 @@ typedef struct st_relay_log_info */ bool no_storage; - /*** The following variables can only be read when protect by data lock ****/ + /* The following variables can only be read when protect by data lock */ /* info_fd - file descriptor of the info file. set only during @@ -165,7 +165,6 @@ typedef struct st_relay_log_info time_t last_master_timestamp; - void clear_slave_error(); void clear_until_condition(); /* @@ -179,11 +178,9 @@ typedef struct st_relay_log_info pthread_mutex_t log_space_lock; pthread_cond_t log_space_cond; THD * sql_thd; - int last_slave_errno; #ifndef DBUG_OFF int events_till_abort; #endif - char last_slave_error[MAX_SLAVE_ERRMSG]; /* if not set, the value of other members of the structure are undefined */ bool inited; |