-
Committer:
Oleg Tsarev
-
Date:
2011-10-19 12:23:32 UTC
-
mfrom:
(204.1.1 rnt-5.1)
-
Revision ID:
oleg.tsarev@percona.com-20111019122332-efncm51fydd0wbfm
Merge Alexey's commit:
Bug #872754: Annotate rows events on slave doesnt' work without slave's binlog
The problem was that Read_Master_Log_Pos was not calculated correctly
when events were being skipped on the master (i.e. Annotate_Rows_Events
when either replicate-annotate-rows-events or log-slave-updates were OFF).
Fixed by changing the calculation so that master_log_pos is read from
the event's header if it's available. Otherwise, proceed with the
default logic.