← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_repl.cc

  • Committer: Monty Taylor
  • Date: 2008-09-23 01:53:40 UTC
  • mto: This revision was merged to the branch mainline in revision 419.
  • Revision ID: monty@inaugust.com-20080923015340-z8p6sbl7y27c4k30
Enabled -Wlong-long.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_repl.cc
400
400
  struct event_coordinates coord_buf;
401
401
  struct timespec *heartbeat_ts= NULL;
402
402
  struct event_coordinates *coord= NULL;
403
 
  if (heartbeat_period != 0LL)
 
403
  if (heartbeat_period != 0L)
404
404
  {
405
405
    heartbeat_ts= &heartbeat_buf;
406
406
    set_timespec_nsec(*heartbeat_ts, 0);
687
687
          {
688
688
            if (coord)
689
689
            {
690
 
              assert(heartbeat_ts && heartbeat_period != 0LL);
 
690
              assert(heartbeat_ts && heartbeat_period != 0L);
691
691
              set_timespec_nsec(*heartbeat_ts, heartbeat_period);
692
692
            }
693
693
            ret= mysql_bin_log.wait_for_update_bin_log(thd, heartbeat_ts);
694
 
            assert(ret == 0 || (heartbeat_period != 0LL && coord != NULL));
 
694
            assert(ret == 0 || (heartbeat_period != 0L && coord != NULL));
695
695
            if (ret == ETIMEDOUT || ret == ETIME)
696
696
            {
697
697
              if (send_heartbeat_event(net, packet, coord))
1188
1188
  else
1189
1189
    mi->heartbeat_period= (float) cmin((double)SLAVE_MAX_HEARTBEAT_PERIOD,
1190
1190
                                      (slave_net_timeout/2.0));
1191
 
  mi->received_heartbeats= 0LL; // counter lives until master is CHANGEd
 
1191
  mi->received_heartbeats= 0L; // counter lives until master is CHANGEd
1192
1192
  if (lex_mi->ssl != LEX_MASTER_INFO::LEX_MI_UNCHANGED)
1193
1193
    mi->ssl= (lex_mi->ssl == LEX_MASTER_INFO::LEX_MI_ENABLE);
1194
1194