diff options
| author | Chad MILLER <chad@mysql.com> | 2008-07-10 14:50:07 -0400 |
|---|---|---|
| committer | Chad MILLER <chad@mysql.com> | 2008-07-10 14:50:07 -0400 |
| commit | c425bf421da9ffa55d3d568f70508fa12dd07aa0 (patch) | |
| tree | 667c2782c7fcee247010d3413aaf80a81fc6dd92 /sql/log_event.cc | |
| parent | 6a6e77eeffc7dbd72888ef685fdb93fc2ae7aed6 (diff) | |
| parent | 0db1f520c629455b4766c3d8f57a9767d7f6a98f (diff) | |
| download | mariadb-git-c425bf421da9ffa55d3d568f70508fa12dd07aa0.tar.gz | |
Merge chunk from trunk.
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index a28e883473a..bc231182f46 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -373,6 +373,7 @@ Log_event::Log_event(const char* buf, #endif when = uint4korr(buf); server_id = uint4korr(buf + SERVER_ID_OFFSET); + data_written= uint4korr(buf + EVENT_LEN_OFFSET); if (description_event->binlog_version==1) { log_pos= 0; @@ -405,7 +406,7 @@ Log_event::Log_event(const char* buf, binlog, so which will cause problems if the user uses this value in CHANGE MASTER). */ - log_pos+= uint4korr(buf + EVENT_LEN_OFFSET); + log_pos+= data_written; /* purecov: inspected */ } DBUG_PRINT("info", ("log_pos: %lu", (ulong) log_pos)); |