diff options
author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2014-07-07 11:17:05 +0200 |
---|---|---|
committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2014-07-07 11:17:05 +0200 |
commit | 2b4b857d51469c5fd974186ba8219e367c2019ec (patch) | |
tree | 9766322c6d04d97affa586a5efd8a00b5f4b8c45 /sql/rpl_record_old.cc | |
parent | d2098b964d6c72b009071ac064498cda9e76b9d6 (diff) | |
download | mariadb-git-2b4b857d51469c5fd974186ba8219e367c2019ec.tar.gz |
MDEV-6120: When slave stops with error, error message should indicate the failing GTID
Follow-up patch. The original patch added an extra argument to the
rli->report() function, however it was forgotten to adjust the calls
accordingly in a few places.
This patch updates the remaining calls as needed. In files log_event_old.cc
and rpl_record_old.cc, it just adds NULL, since this is only for old event
formats from ancient master servers, which would not have any GTID information
to add to the error messages in any case.
Diffstat (limited to 'sql/rpl_record_old.cc')
-rw-r--r-- | sql/rpl_record_old.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/rpl_record_old.cc b/sql/rpl_record_old.cc index 5afa529a63c..8b43b268c17 100644 --- a/sql/rpl_record_old.cc +++ b/sql/rpl_record_old.cc @@ -141,7 +141,7 @@ unpack_row_old(rpl_group_info *rgi, f->move_field_offset(-offset); if (!ptr) { - rgi->rli->report(ERROR_LEVEL, ER_SLAVE_CORRUPT_EVENT, + rgi->rli->report(ERROR_LEVEL, ER_SLAVE_CORRUPT_EVENT, NULL, "Could not read field `%s` of table `%s`.`%s`", f->field_name, table->s->db.str, table->s->table_name.str); @@ -183,7 +183,7 @@ unpack_row_old(rpl_group_info *rgi, if (event_type == WRITE_ROWS_EVENT && ((*field_ptr)->flags & mask) == mask) { - rgi->rli->report(ERROR_LEVEL, ER_NO_DEFAULT_FOR_FIELD, + rgi->rli->report(ERROR_LEVEL, ER_NO_DEFAULT_FOR_FIELD, NULL, "Field `%s` of table `%s`.`%s` " "has no default value and cannot be NULL", (*field_ptr)->field_name, table->s->db.str, |