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/sql_repl.cc | |
| 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/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 92c8aca0e0c..6238a801b9b 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -985,7 +985,7 @@ int reset_slave(THD *thd, MASTER_INFO* mi) Reset errors (the idea is that we forget about the old master). */ - mi->rli.clear_slave_error(); + mi->rli.clear_error(); mi->rli.clear_until_condition(); // close master_info_file, relay_log_info_file, set mi->inited=rli->inited=0 @@ -1251,7 +1251,7 @@ bool change_master(THD* thd, MASTER_INFO* mi) pthread_mutex_lock(&mi->rli.data_lock); mi->rli.abort_pos_wait++; /* for MASTER_POS_WAIT() to abort */ /* Clear the errors, for a clean start */ - mi->rli.clear_slave_error(); + mi->rli.clear_error(); mi->rli.clear_until_condition(); /* If we don't write new coordinates to disk now, then old will remain in |