summaryrefslogtreecommitdiff
path: root/sql/slave.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-05-04 07:16:38 +0200
committerSergei Golubchik <sergii@pisem.net>2012-05-04 07:16:38 +0200
commit44cf9ee5f7acd2148dc32f4eee4519a087c52b93 (patch)
tree5b67e89f11e9cdac90d6cc13655e61a55400addd /sql/slave.cc
parent550d6871a5eb93013435055e11a4fe3009490c82 (diff)
parentd335b471918b4ab0bca05984a70669653cf3169f (diff)
downloadmariadb-git-44cf9ee5f7acd2148dc32f4eee4519a087c52b93.tar.gz
5.3 merge
Diffstat (limited to 'sql/slave.cc')
-rw-r--r--sql/slave.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/slave.cc b/sql/slave.cc
index 941a275cd84..94af12472c1 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -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));
}
/*