diff options
| author | mats@kindahl-laptop.dnsalias.net <> | 2007-06-11 22:15:39 +0200 |
|---|---|---|
| committer | mats@kindahl-laptop.dnsalias.net <> | 2007-06-11 22:15:39 +0200 |
| commit | 7bc43ebfc9dfee595530b9707b9d6797e2a60adf (patch) | |
| tree | a5aeb5e654946367a567da821efa7b17263f59d2 /sql/rpl_reporting.cc | |
| parent | a4c6ff85513cd9b42bd1f2f2c28844177ced0270 (diff) | |
| download | mariadb-git-7bc43ebfc9dfee595530b9707b9d6797e2a60adf.tar.gz | |
BUG#24954 (Last_errno and Last_error not set after master_retry_count has
been reached):
Post-merge patch to handle all the changes to the tree since the tree
was cloned.
Diffstat (limited to 'sql/rpl_reporting.cc')
| -rw-r--r-- | sql/rpl_reporting.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sql/rpl_reporting.cc b/sql/rpl_reporting.cc index d14dbdcc930..28f257790c7 100644 --- a/sql/rpl_reporting.cc +++ b/sql/rpl_reporting.cc @@ -3,7 +3,8 @@ #include "rpl_reporting.h" void -Slave_reporting_capability::report(loglevel level, int err_code, const char *msg, ...) +Slave_reporting_capability::report(loglevel level, int err_code, + const char *msg, ...) const { void (*report_function)(const char *, ...); char buff[MAX_SLAVE_ERRMSG]; @@ -19,9 +20,9 @@ Slave_reporting_capability::report(loglevel level, int err_code, const char *msg It's an error, it must be reported in Last_error and Last_errno in SHOW SLAVE STATUS. */ - pbuff= last_error.message; - pbuffsize= sizeof(last_error.message); - last_error.number = err_code; + pbuff= m_last_error.message; + pbuffsize= sizeof(m_last_error.message); + m_last_error.number = err_code; report_function= sql_print_error; break; case WARNING_LEVEL: |