← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/mi_check.cc

  • Committer: Olaf van der Spek
  • Date: 2011-08-13 15:57:32 UTC
  • mto: This revision was merged to the branch mainline in revision 2407.
  • Revision ID: olafvdspek@gmail.com-20110813155732-jrr1aq3gyeyxl9qv
Move flush() into iocache

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_check.cc
1520
1520
      goto err;
1521
1521
  }
1522
1522
  if (error > 0 || write_data_suffix(&sort_info, (bool)!rep_quick) ||
1523
 
      flush_io_cache(&info->rec_cache) || param->read_cache.error < 0)
 
1523
      info->rec_cache.flush() || param->read_cache.error < 0)
1524
1524
    goto err;
1525
1525
 
1526
1526
  if (param->testflag & T_WRITE_LOOP)
3047
3047
    if (sort_param->calc_checksum)
3048
3048
      param->glob_crc-=(*info->s->calc_checksum)(info, sort_param->record);
3049
3049
  }
3050
 
  error=flush_io_cache(&info->rec_cache) || (*info->s->delete_record)(info);
 
3050
  error= info->rec_cache.flush() || (*info->s->delete_record)(info);
3051
3051
  info->dfile=old_file;                         /* restore actual value */
3052
3052
  info->state->records--;
3053
3053
  return(error);