← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/rpl_rli.h

  • Committer: Stewart Smith
  • Date: 2008-07-25 03:48:54 UTC
  • mfrom: (207.1.1 drizzle)
  • mto: (210.1.1 drizzle)
  • mto: This revision was merged to the branch mainline in revision 211.
  • Revision ID: stewart@flamingspork.com-20080725034854-p34pdb0lhpoc159d
merge mainline and update md5 and crc32 plugins to new interface

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/rpl_rli.h
128
128
    Needed to deal properly with cur_log getting closed and re-opened with
129
129
    a different log under our feet
130
130
  */
131
 
  uint32 cur_log_old_open_count;
 
131
  uint32_t cur_log_old_open_count;
132
132
  
133
133
  /*
134
134
    Let's call a group (of events) :
194
194
    skipping one or more events in the master log that have caused
195
195
    errors, and have been manually applied by DBA already.
196
196
  */
197
 
  volatile uint32 slave_skip_counter;
 
197
  volatile uint32_t slave_skip_counter;
198
198
  volatile uint32_t abort_pos_wait;     /* Incremented on change master */
199
199
  volatile uint32_t slave_run_id;               /* Incremented on slave start */
200
200
  pthread_mutex_t log_space_lock;
285
285
  void inc_group_relay_log_pos(uint64_t log_pos,
286
286
                               bool skip_lock=0);
287
287
 
288
 
  int32_t wait_for_pos(THD* thd, String* log_name, longlong log_pos, 
289
 
                   longlong timeout);
 
288
  int32_t wait_for_pos(THD* thd, String* log_name, int64_t log_pos, 
 
289
                   int64_t timeout);
290
290
  void close_temporary_tables();
291
291
 
292
292
  /* Check if UNTIL condition is satisfied. See slave.cc for more. */
401
401
  }
402
402
 
403
403
private:
404
 
  uint32 m_flags;
 
404
  uint32_t m_flags;
405
405
};
406
406
 
407
407