diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-05-18 09:50:30 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-05-18 09:50:30 -0700 |
| commit | d48b4a83a28750ccd9364e8e68ba5bfb9221858b (patch) | |
| tree | b464c088716907ab8f697f7668c93e092e35b069 /sql/slave.cc | |
| parent | 9b79feba56d8b0f955447afddbc4ab8b1d4d33c1 (diff) | |
| parent | 8e95e6543b629e67e68974b8657ecfda0ba29c8a (diff) | |
| download | mariadb-git-d48b4a83a28750ccd9364e8e68ba5bfb9221858b.tar.gz | |
Merge.
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 9f593b3075e..94af12472c1 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -4155,8 +4155,8 @@ static int queue_event(Master_info* mi,const char* buf, ulong event_len) { int error= 0; String error_msg; - ulong inc_pos; - ulong event_pos; + ulonglong inc_pos; + ulonglong event_pos; Relay_log_info *rli= &mi->rli; mysql_mutex_t *log_lock= rli->relay_log.get_log_lock(); ulong s_id; @@ -4431,10 +4431,9 @@ static int queue_event(Master_info* mi,const char* buf, ulong event_len) (event_pos= uint4korr(buf+LOG_POS_OFFSET)) > mi->master_log_pos + inc_pos) { inc_pos= event_pos - mi->master_log_pos; - DBUG_PRINT("info", ("Adjust master_log_pos %lu->%lu to account for " + DBUG_PRINT("info", ("Adjust master_log_pos %llu->%llu to account for " "master-side filtering", - (unsigned long)(mi->master_log_pos + inc_pos), - event_pos)); + mi->master_log_pos + inc_pos, event_pos)); } /* |