diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-20 16:15:05 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-20 16:15:05 +0100 |
| commit | 3a1716a7e79e6fe05a166211002321f73465ec79 (patch) | |
| tree | 8b9eeab4e037c893ea4cd994b5a7d9e1b1825f5b /sql/slave.cc | |
| parent | d07664498be9c71c01c7df9f2fb1d18c7060b2e3 (diff) | |
| parent | 7993f893b844d71183956ee30a6fb37fc10ae90c (diff) | |
| download | mariadb-git-3a1716a7e79e6fe05a166211002321f73465ec79.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 83edc52c3fd..01a86979648 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -6098,7 +6098,7 @@ static int queue_event(Master_info* mi,const char* buf, ulong event_len) error= ER_SLAVE_HEARTBEAT_FAILURE; error_msg.append(STRING_WITH_LEN("inconsistent heartbeat event content;")); error_msg.append(STRING_WITH_LEN("the event's data: log_file_name ")); - error_msg.append(hb.get_log_ident(), (uint) strlen(hb.get_log_ident())); + error_msg.append(hb.get_log_ident(), (uint) hb.get_ident_len()); error_msg.append(STRING_WITH_LEN(" log_pos ")); error_msg.append_ulonglong(hb.log_pos); goto err; @@ -6124,7 +6124,7 @@ static int queue_event(Master_info* mi,const char* buf, ulong event_len) error= ER_SLAVE_HEARTBEAT_FAILURE; error_msg.append(STRING_WITH_LEN("heartbeat is not compatible with local info;")); error_msg.append(STRING_WITH_LEN("the event's data: log_file_name ")); - error_msg.append(hb.get_log_ident(), (uint) strlen(hb.get_log_ident())); + error_msg.append(hb.get_log_ident(), (uint) hb.get_ident_len()); error_msg.append(STRING_WITH_LEN(" log_pos ")); error_msg.append_ulonglong(hb.log_pos); goto err; |