← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/ha_myisam.cc

  • Committer: Eric Day
  • Date: 2009-08-31 23:50:37 UTC
  • mto: This revision was merged to the branch mainline in revision 1134.
  • Revision ID: eday@oddments.org-20090831235037-hwwe6zhq94o4lxtd
Removed purecov messages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/ha_myisam.cc
179
179
          &keyseg,
180
180
          (share->key_parts + share->keys) * sizeof(HA_KEYSEG),
181
181
          NULL)))
182
 
    return(HA_ERR_OUT_OF_MEM); /* purecov: inspected */
 
182
    return(HA_ERR_OUT_OF_MEM);
183
183
  keydef= *keydef_out;
184
184
  recinfo= *recinfo_out;
185
185
  pos= table_arg->key_info;
387
387
      {
388
388
        if ((t1_keysegs_j__type == HA_KEYTYPE_VARTEXT2) &&
389
389
            (t2_keysegs[j].type == HA_KEYTYPE_VARTEXT1))
390
 
          t1_keysegs_j__type= HA_KEYTYPE_VARTEXT1; /* purecov: tested */
 
390
          t1_keysegs_j__type= HA_KEYTYPE_VARTEXT1;
391
391
        else if ((t1_keysegs_j__type == HA_KEYTYPE_VARBINARY2) &&
392
392
                 (t2_keysegs[j].type == HA_KEYTYPE_VARBINARY1))
393
 
          t1_keysegs_j__type= HA_KEYTYPE_VARBINARY1; /* purecov: inspected */
 
393
          t1_keysegs_j__type= HA_KEYTYPE_VARBINARY1;
394
394
      }
395
395
 
396
396
      if (t1_keysegs_j__type != t2_keysegs[j].type ||
556
556
  {
557
557
    if ((my_errno= table2myisam(table, &keyinfo, &recinfo, &recs)))
558
558
    {
559
 
      /* purecov: begin inspected */
560
559
      goto err;
561
 
      /* purecov: end */
562
560
    }
563
561
    if (check_definition(keyinfo, recinfo, table->s->keys, recs,
564
562
                         file->s->keyinfo, file->s->rec,
565
563
                         file->s->base.keys, file->s->base.fields, true))
566
564
    {
567
 
      /* purecov: begin inspected */
568
565
      my_errno= HA_ERR_CRASHED;
569
566
      goto err;
570
 
      /* purecov: end */
571
567
    }
572
568
  }
573
569
 
1364
1360
  TableShare *share= table_arg->s;
1365
1361
  uint32_t options= share->db_options_in_use;
1366
1362
  if ((error= table2myisam(table_arg, &keydef, &recinfo, &create_records)))
1367
 
    return(error); /* purecov: inspected */
 
1363
    return(error);
1368
1364
  memset(&create_info, 0, sizeof(create_info));
1369
1365
  create_info.max_rows= create_proto->options().max_rows();
1370
1366
  create_info.reloc_rows= create_proto->options().min_rows();