← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/sql_repl.cc

  • Committer: Brian Aker
  • Date: 2008-07-07 14:25:25 UTC
  • mto: (77.1.25 codestyle)
  • mto: This revision was merged to the branch mainline in revision 82.
  • Revision ID: brian@tangent.org-20080707142525-xzy2nl3ie2ebwfln
LL() cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_repl.cc
415
415
  struct event_coordinates coord_buf;
416
416
  struct timespec *heartbeat_ts= NULL;
417
417
  struct event_coordinates *coord= NULL;
418
 
  if (heartbeat_period != LL(0))
 
418
  if (heartbeat_period != 0LL)
419
419
  {
420
420
    heartbeat_ts= &heartbeat_buf;
421
421
    set_timespec_nsec(*heartbeat_ts, 0);
737
737
          {
738
738
            if (coord)
739
739
            {
740
 
              DBUG_ASSERT(heartbeat_ts && heartbeat_period != LL(0));
 
740
              DBUG_ASSERT(heartbeat_ts && heartbeat_period != 0LL);
741
741
              set_timespec_nsec(*heartbeat_ts, heartbeat_period);
742
742
            }
743
743
            ret= mysql_bin_log.wait_for_update_bin_log(thd, heartbeat_ts);
744
 
            DBUG_ASSERT(ret == 0 || heartbeat_period != LL(0) && coord != NULL);
 
744
            DBUG_ASSERT(ret == 0 || heartbeat_period != 0LL && coord != NULL);
745
745
            if (ret == ETIMEDOUT || ret == ETIME)
746
746
            {
747
747
#ifndef DBUG_OFF
1254
1254
  else
1255
1255
    mi->heartbeat_period= (float) min(SLAVE_MAX_HEARTBEAT_PERIOD,
1256
1256
                                      (slave_net_timeout/2.0));
1257
 
  mi->received_heartbeats= LL(0); // counter lives until master is CHANGEd
 
1257
  mi->received_heartbeats= 0LL; // counter lives until master is CHANGEd
1258
1258
  if (lex_mi->ssl != LEX_MASTER_INFO::LEX_MI_UNCHANGED)
1259
1259
    mi->ssl= (lex_mi->ssl == LEX_MASTER_INFO::LEX_MI_ENABLE);
1260
1260