diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-10-15 12:59:13 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-10-15 12:59:13 +0200 |
| commit | f62c12b405ba7ec80b8e2490856b83c6f5899211 (patch) | |
| tree | 010605c7f145da6ea6ac14b39abc4cf700d619b1 /sql/rpl_reporting.cc | |
| parent | f947f73b2b6d2bd246b81a9038224d2a85777520 (diff) | |
| parent | f1afc003eefe0aafd3e070c7453d9e029d8445a8 (diff) | |
| download | mariadb-git-f62c12b405ba7ec80b8e2490856b83c6f5899211.tar.gz | |
Merge 10.0.14 into 10.1
Diffstat (limited to 'sql/rpl_reporting.cc')
| -rw-r--r-- | sql/rpl_reporting.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/rpl_reporting.cc b/sql/rpl_reporting.cc index 96fe6242ac3..eb362941f3e 100644 --- a/sql/rpl_reporting.cc +++ b/sql/rpl_reporting.cc @@ -28,6 +28,7 @@ Slave_reporting_capability::Slave_reporting_capability(char const *thread_name) void Slave_reporting_capability::report(loglevel level, int err_code, + const char *extra_info, const char *msg, ...) const { void (*report_function)(const char *, ...); @@ -67,9 +68,10 @@ Slave_reporting_capability::report(loglevel level, int err_code, va_end(args); /* If the msg string ends with '.', do not add a ',' it would be ugly */ - report_function("Slave %s: %s%s Internal MariaDB error code: %d", + report_function("Slave %s: %s%s %s%sInternal MariaDB error code: %d", m_thread_name, pbuff, (pbuff[0] && *(strend(pbuff)-1) == '.') ? "" : ",", + (extra_info ? extra_info : ""), (extra_info ? ", " : ""), err_code); } |