← 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-14 12:20:36 UTC
  • mto: This revision was merged to the branch mainline in revision 2407.
  • Revision ID: olafvdspek@gmail.com-20110814122036-ydjayvqjgwixp3o8
Refactor iocache

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/mi_check.cc
911
911
      goto err2;
912
912
    switch (info->s->data_file_type) {
913
913
    case STATIC_RECORD:
914
 
      if (my_b_read(&param->read_cache,(unsigned char*) record,
915
 
                    info->s->base.pack_reclength))
916
 
        goto err;
 
914
      if (param->read_cache.read(record, info->s->base.pack_reclength))
 
915
        goto err;
917
916
      start_recpos=pos;
918
917
      pos+=info->s->base.pack_reclength;
919
918
      splits++;
2398
2397
  case STATIC_RECORD:
2399
2398
    for (;;)
2400
2399
    {
2401
 
      if (my_b_read(&sort_param->read_cache,sort_param->record,
2402
 
                    share->base.pack_reclength))
 
2400
      if (sort_param->read_cache.read(sort_param->record, share->base.pack_reclength))
2403
2401
      {
2404
2402
        if (sort_param->read_cache.error)
2405
2403
          param->out_flag |= O_DATA_LOST;
2757
2755
  {
2758
2756
    switch (sort_info->new_data_file_type) {
2759
2757
    case STATIC_RECORD:
2760
 
      if (my_b_write(&info->rec_cache,sort_param->record,
2761
 
                     share->base.pack_reclength))
 
2758
      if (info->rec_cache.write(sort_param->record, share->base.pack_reclength))
2762
2759
      {
2763
2760
        mi_check_print_error(param,"%d when writing to datafile",errno);
2764
2761
        return(1);
3140
3137
  {
3141
3138
    unsigned char buff[MEMMAP_EXTRA_MARGIN];
3142
3139
    memset(buff, 0, sizeof(buff));
3143
 
    if (my_b_write(&info->rec_cache,buff,sizeof(buff)))
 
3140
    if (info->rec_cache.write(buff, sizeof(buff)))
3144
3141
    {
3145
3142
      mi_check_print_error(sort_info->param,
3146
3143
                           "%d when writing to datafile",errno);