diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-19 12:22:12 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-19 12:22:12 +0100 |
| commit | f31bf6f09426155bb4efa9d2ea6060fb71da87a2 (patch) | |
| tree | 4987b6ded980cb6524d5d4e0ce8dfdc9f9b67ae6 /sql/slave.cc | |
| parent | 02af6278fb7c7889a02d617eb23e82fe7967abd7 (diff) | |
| parent | 4d1c1b23e1373bbd4e72f524e855f1db076d2c73 (diff) | |
| download | mariadb-git-f31bf6f09426155bb4efa9d2ea6060fb71da87a2.tar.gz | |
Merge branch '5.5' into 10.1
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 c877a1e2c2c..cbfc3fd8413 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -5920,7 +5920,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; @@ -5947,7 +5947,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; |