bzr commit into mysql-trunk-merge branch (tor.didriksen:3295) Bug#45288

[Tor Didriksen]

#At file:///export/home/didrik/repo/trunk-merge/ based on revid:li-bing.song@stripped

 3295 Tor Didriksen	2010-10-25
      Bug#45288: pb2 returns a lot of compilation warnings
     @ sql/rpl_slave.cc
        Fix inconsistent print format string.

    modified:
      sql/rpl_slave.cc
=== modified file 'sql/rpl_slave.cc'
--- a/sql/rpl_slave.cc	2010-10-16 14:35:20 +0000
+++ b/sql/rpl_slave.cc	2010-10-25 08:09:50 +0000
@@ -2446,11 +2446,11 @@ static void sql_delay_event(Log_event *e
                         "ev->when= %lu "
                         "rli->mi->clock_diff_with_master= %lu "
                         "now= %ld "
-                        "sql_delay_end= %lu "
+                        "sql_delay_end= %ld "
                         "nap_time= %ld",
                         sql_delay, (long)ev->when,
                         rli->mi->clock_diff_with_master,
-                        (long)now, sql_delay_end, (long)nap_time));
+                        (long)now, (long)sql_delay_end, (long)nap_time));
 
     if (sql_delay_end > now)
     {


Attachment: [text/bzr-bundle] bzr/[e-mail]