summaryrefslogtreecommitdiff
path: root/sql/log_event.cc
diff options
context:
space:
mode:
authorAlexey Kopytov <Alexey.Kopytov@sun.com>2009-02-23 17:16:46 +0200
committerAlexey Kopytov <Alexey.Kopytov@sun.com>2009-02-23 17:16:46 +0200
commit144763db0c9684c37a49254b88d2cefd98316dcd (patch)
treebe0c47e67d512b5fe740d4c55299d68cd6542b9a /sql/log_event.cc
parentc893a5f0e213b0672906f8d630fba402f480175c (diff)
parentd86c8af30ee31aad6db59936135dbd0b42c1216d (diff)
downloadmariadb-git-144763db0c9684c37a49254b88d2cefd98316dcd.tar.gz
Manual merge mysql-5.0-bugteam -> mysql-5.1-bugteam.
Diffstat (limited to 'sql/log_event.cc')
-rw-r--r--sql/log_event.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc
index 243790c7d76..d1d29ed5b8e 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -1258,7 +1258,7 @@ void Log_event::print_header(IO_CACHE* file,
my_b_printf(file, "#");
print_timestamp(file);
- my_b_printf(file, " server id %d end_log_pos %s ", server_id,
+ my_b_printf(file, " server id %lu end_log_pos %s ", server_id,
llstr(log_pos,llbuff));
/* mysqlbinlog --hexdump */