diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-10 11:19:25 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-10 11:19:25 +0300 |
| commit | c11e5cdd12a6ffbc3c95e0abff6cc86920d592fa (patch) | |
| tree | 1f860a1e1cb620fa9a71c99967bb19d64a8c2a3c /sql/slave.cc | |
| parent | 62dce14d156ff99836a23f5ccadcfaa19cf11f8a (diff) | |
| parent | cf71cc838e608b4a4b8ae2557d4957ecb9bef97a (diff) | |
| download | mariadb-git-c11e5cdd12a6ffbc3c95e0abff6cc86920d592fa.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index f480e68232f..1ed701c75a2 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -6292,6 +6292,7 @@ static int queue_event(Master_info* mi,const char* buf, ulong event_len) DBUG_ASSERT(debug_sync_service); DBUG_ASSERT(!debug_sync_set_action(current_thd, STRING_WITH_LEN(act))); + dbug_rows_event_count = 0; };); #endif mysql_mutex_lock(&mi->data_lock); @@ -6818,7 +6819,18 @@ static int queue_event(Master_info* mi,const char* buf, ulong event_len) mi->last_queued_gtid.seq_no == 1000) goto skip_relay_logging; }); + goto default_action; #endif + case START_ENCRYPTION_EVENT: + if (uint2korr(buf + FLAGS_OFFSET) & LOG_EVENT_IGNORABLE_F) + { + /* + If the event was not requested by the slave (the slave did not ask for + it), i.e. has end_log_pos=0, we do not increment mi->master_log_pos + */ + inc_pos= uint4korr(buf+LOG_POS_OFFSET) ? event_len : 0; + break; + } /* fall through */ default: default_action: |