← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/replication/mi.cc

Merged in Eric's whitespace cleanup.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/replication/mi.cc
145
145
void Master_info::reset()
146
146
{
147
147
  log_name.clear();
148
 
  log_pos= 0; 
 
148
  log_pos= 0;
149
149
}
150
150
 
151
151
 
211
211
    record->set_log_position(log_pos);
212
212
 
213
213
    fstream output(info_filename.c_str(), ios::out | ios::trunc | ios::binary);
214
 
    if (!list.SerializeToOstream(&output)) 
215
 
    { 
 
214
    if (!list.SerializeToOstream(&output))
 
215
    {
216
216
      assert(0);
217
217
      return -1;
218
218
    }
221
221
  {
222
222
    /* Read Master info file here (from info_filename) */
223
223
    fstream input(info_filename.c_str(), ios::in | ios::binary);
224
 
    if (!list.ParseFromIstream(&input)) 
 
224
    if (!list.ParseFromIstream(&input))
225
225
    {
226
226
      assert(0);
227
227
      return -1;
296
296
  record->set_log_position(log_pos);
297
297
 
298
298
  fstream output(info_filename.c_str(), ios::out | ios::trunc | ios::binary);
299
 
  if (!list.SerializeToOstream(&output)) 
300
 
  { 
 
299
  if (!list.SerializeToOstream(&output))
 
300
  {
301
301
    assert(0);
302
302
    return 1;
303
303
  }