← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/rpl_mi.cc

  • Committer: Brian Aker
  • Date: 2008-08-10 17:18:41 UTC
  • mfrom: (287.3.13 codestyle)
  • Revision ID: brian@tangent.org-20080810171841-pkvi2ky94wbd0nt5
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/rpl_mi.cc
65
65
    if CHANGE MASTER did not specify it.  (no data loss in conversion
66
66
    as hb period has a max)
67
67
  */
68
 
  mi->heartbeat_period= (float) min(SLAVE_MAX_HEARTBEAT_PERIOD,
 
68
  mi->heartbeat_period= (float) min((double)SLAVE_MAX_HEARTBEAT_PERIOD,
69
69
                                    (slave_net_timeout/2.0));
70
70
  assert(mi->heartbeat_period > (float) 0.001
71
71
              || mi->heartbeat_period == 0);