← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/myisam/ha_myisam.cc

Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/myisam/ha_myisam.cc
142
142
          &keyseg,
143
143
          (share->key_parts + share->keys) * sizeof(HA_KEYSEG),
144
144
          NULL)))
145
 
    return(HA_ERR_OUT_OF_MEM); /* purecov: inspected */
 
145
    return(HA_ERR_OUT_OF_MEM);
146
146
  keydef= *keydef_out;
147
147
  recinfo= *recinfo_out;
148
148
  pos= table_arg->key_info;
350
350
      {
351
351
        if ((t1_keysegs_j__type == HA_KEYTYPE_VARTEXT2) &&
352
352
            (t2_keysegs[j].type == HA_KEYTYPE_VARTEXT1))
353
 
          t1_keysegs_j__type= HA_KEYTYPE_VARTEXT1; /* purecov: tested */
 
353
          t1_keysegs_j__type= HA_KEYTYPE_VARTEXT1;
354
354
        else if ((t1_keysegs_j__type == HA_KEYTYPE_VARBINARY2) &&
355
355
                 (t2_keysegs[j].type == HA_KEYTYPE_VARBINARY1))
356
 
          t1_keysegs_j__type= HA_KEYTYPE_VARBINARY1; /* purecov: inspected */
 
356
          t1_keysegs_j__type= HA_KEYTYPE_VARBINARY1;
357
357
      }
358
358
 
359
359
      if (t1_keysegs_j__type != t2_keysegs[j].type ||
521
521
  {
522
522
    if ((my_errno= table2myisam(table, &keyinfo, &recinfo, &recs)))
523
523
    {
524
 
      /* purecov: begin inspected */
525
524
      goto err;
526
 
      /* purecov: end */
527
525
    }
528
526
    if (check_definition(keyinfo, recinfo, table->s->keys, recs,
529
527
                         file->s->keyinfo, file->s->rec,
530
528
                         file->s->base.keys, file->s->base.fields, true))
531
529
    {
532
 
      /* purecov: begin inspected */
533
530
      my_errno= HA_ERR_CRASHED;
534
531
      goto err;
535
 
      /* purecov: end */
536
532
    }
537
533
  }
538
534
 
1329
1325
  TableShare *share= table_arg->s;
1330
1326
  uint32_t options= share->db_options_in_use;
1331
1327
  if ((error= table2myisam(table_arg, &keydef, &recinfo, &create_records)))
1332
 
    return(error); /* purecov: inspected */
 
1328
    return(error);
1333
1329
  memset(&create_info, 0, sizeof(create_info));
1334
1330
  create_info.max_rows= create_proto->options().max_rows();
1335
1331
  create_info.reloc_rows= create_proto->options().min_rows();