bzr push into mysql-trunk branch (andrei.elkin:4490 to 4491)

[Andrei Elkin]

 4491 Andrei Elkin	2012-09-18
      fixing compiliation issue on Freebsd where time_t is apparently expanded into int.

    modified:
      sql/rpl_slave.cc
 4490 Tor Didriksen	2012-09-17
      Bug#14635144 IMPROVE FILESORT MEMCMP BY COMPARING WORDS RATHER THAN BYTES

    modified:
      sql/filesort_utils.cc
      unittest/gunit/filesort_compare-t.cc
=== modified file 'sql/rpl_slave.cc'
--- a/sql/rpl_slave.cc	2012-08-27 07:45:44 +0000
+++ b/sql/rpl_slave.cc	2012-09-18 09:49:37 +0000
@@ -3411,7 +3411,7 @@ apply_event_and_update_pos(Log_event** p
                                 "waited due a Worker queue full = %lu; "
                                 "waited due the total size = %lu; "
                                 "slept when Workers occupied = %lu ",
-                                my_now - rli->mts_last_online_stat,
+                                (ulong) my_now - rli->mts_last_online_stat,
                                 rli->mts_events_assigned,
                                 rli->mts_wq_overrun_cnt,
                                 rli->mts_wq_overfill_cnt,

No bundle (reason: useless for push emails).