summaryrefslogtreecommitdiff
path: root/sql/rpl_record.cc
diff options
context:
space:
mode:
authorKristian Nielsen <knielsen@knielsen-hq.org>2014-07-07 11:17:05 +0200
committerKristian Nielsen <knielsen@knielsen-hq.org>2014-07-07 11:17:05 +0200
commit2b4b857d51469c5fd974186ba8219e367c2019ec (patch)
tree9766322c6d04d97affa586a5efd8a00b5f4b8c45 /sql/rpl_record.cc
parentd2098b964d6c72b009071ac064498cda9e76b9d6 (diff)
downloadmariadb-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.cc')
-rw-r--r--sql/rpl_record.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/rpl_record.cc b/sql/rpl_record.cc
index a6d93d10f11..7aed393b031 100644
--- a/sql/rpl_record.cc
+++ b/sql/rpl_record.cc
@@ -317,6 +317,7 @@ unpack_row(rpl_group_info *rgi,
if (!pack_ptr)
{
rgi->rli->report(ERROR_LEVEL, ER_SLAVE_CORRUPT_EVENT,
+ rgi->gtid_info(),
"Could not read field '%s' of table '%s.%s'",
f->field_name, table->s->db.str,
table->s->table_name.str);