← Back to branch summary

~ubuntu-branches/ubuntu/trusty/mariadb-5.5/trusty-proposed

« back to all changes in this revision

Viewing changes to sql/sql_repl.cc

  • Committer: Package Import Robot
  • Author(s): Otto Kekäläinen, Otto Kekäläinen, James Page
  • Date: 2014-03-02 01:38:26 UTC
  • mfrom: (2.1.2 sid)
  • Revision ID: package-import@ubuntu.com-20140302013826-z3afnfteqo86pccd
Tags: 5.5.36-1
http://bugs.debian.org/739750
http://bugs.debian.org/739841
http://bugs.debian.org/739360
[ Otto Kekäläinen ]
* New upstream release.
* Updated Danish debconf translation (Closes: #739750).
* d/control: Added explicit Conflicts/Replaces for mysql-5.6 packages
  (Closes: #739841).
* d/control: Update for use of virtual-* packages for switching to/from
  MySQL alternatives.

[ James Page ]
* d/control: Drop Nicholas from Uploaders, MIA (Closes: #739360).
* d/control: Add libjemalloc-dev to BD's.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_repl.cc
655
655
    set_timespec_nsec(*heartbeat_ts, 0);
656
656
  }
657
657
  if (global_system_variables.log_warnings > 1)
658
 
    sql_print_information("Start binlog_dump to slave_server(%d), pos(%s, %lu)",
 
658
    sql_print_information("Start binlog_dump to slave_server(%u), pos(%s, %lu)",
659
659
                        thd->server_id, log_ident, (ulong)pos);
660
660
  if (RUN_HOOK(binlog_transmit, transmit_start, (thd, flags, log_ident, pos)))
661
661
  {