← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/slave.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/slave.cc
1303
1303
        special marker to say "consider we have caught up".
1304
1304
      */
1305
1305
      protocol->store((int64_t)(mi->rli.last_master_timestamp ?
1306
 
                                 max(0, time_diff) : 0));
 
1306
                                 max((long)0, time_diff) : 0));
1307
1307
    }
1308
1308
    else
1309
1309
    {
1829
1829
            exec_res= 0;
1830
1830
            end_trans(thd, ROLLBACK);
1831
1831
            /* chance for concurrent connection to get more locks */
1832
 
            safe_sleep(thd, min(rli->trans_retries, MAX_SLAVE_RETRY_PAUSE),
 
1832
            safe_sleep(thd, min(rli->trans_retries, (uint32_t)MAX_SLAVE_RETRY_PAUSE),
1833
1833
                       (CHECK_KILLED_FUNC)sql_slave_killed, (void*)rli);
1834
1834
            pthread_mutex_lock(&rli->data_lock); // because of SHOW STATUS
1835
1835
            rli->trans_retries++;
3318
3318
    relay_log_pos       Current log pos
3319
3319
    pending             Number of bytes already processed from the event
3320
3320
  */
3321
 
  rli->event_relay_log_pos= max(rli->event_relay_log_pos, BIN_LOG_HEADER_SIZE);
 
3321
  rli->event_relay_log_pos= max(rli->event_relay_log_pos, (uint64_t)BIN_LOG_HEADER_SIZE);
3322
3322
  my_b_seek(cur_log,rli->event_relay_log_pos);
3323
3323
  return(cur_log);
3324
3324
}