← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/ha_myisam.cc

Merged from Mats.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/ha_myisam.cc
238
238
    }
239
239
    if (recpos != minpos)
240
240
    { // Reserved space (Null bits?)
241
 
      memset((char*) recinfo_pos, 0, sizeof(*recinfo_pos));
 
241
      memset(recinfo_pos, 0, sizeof(*recinfo_pos));
242
242
      recinfo_pos->type= (int) FIELD_NORMAL;
243
243
      recinfo_pos++->length= (uint16_t) (minpos - recpos);
244
244
    }
1513
1513
    share->keys_for_keyread.intersect(share->keys_in_use);
1514
1514
    share->db_record_offset= misam_info.record_offset;
1515
1515
    if (share->key_parts)
1516
 
      memcpy((char*) table->key_info[0].rec_per_key,
1517
 
             (char*) misam_info.rec_per_key,
 
1516
      memcpy(table->key_info[0].rec_per_key,
 
1517
             misam_info.rec_per_key,
1518
1518
             sizeof(table->key_info[0].rec_per_key)*share->key_parts);
1519
1519
    if (share->tmp_table == NO_TMP_TABLE)
1520
1520
      pthread_mutex_unlock(&share->mutex);
1626
1626
  uint options= share->db_options_in_use;
1627
1627
  if ((error= table2myisam(table_arg, &keydef, &recinfo, &records)))
1628
1628
    return(error); /* purecov: inspected */
1629
 
  memset((char*) &create_info, 0, sizeof(create_info));
 
1629
  memset(&create_info, 0, sizeof(create_info));
1630
1630
  create_info.max_rows= share->max_rows;
1631
1631
  create_info.reloc_rows= share->min_rows;
1632
1632
  create_info.with_auto_increment= share->next_number_key_offset == 0;