← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/mi_create.c

  • Committer: Brian Aker
  • Date: 2008-08-05 04:10:42 UTC
  • mfrom: (261.2.8 codestyle)
  • mto: This revision was merged to the branch mainline in revision 263.
  • Revision ID: brian@tangent.org-20080805041042-1l4893r3bwy2lxz2
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/mi_create.c
55
55
 
56
56
  if (!ci)
57
57
  {
58
 
    memset((char*) &tmp_create_info, 0, sizeof(tmp_create_info));
 
58
    memset(&tmp_create_info, 0, sizeof(tmp_create_info));
59
59
    ci=&tmp_create_info;
60
60
  }
61
61
 
65
65
  }
66
66
  errpos= 0;
67
67
  options= 0;
68
 
  memset((uchar*) &share, 0, sizeof(share));
 
68
  memset(&share, 0, sizeof(share));
69
69
 
70
70
  if (flags & HA_DONT_TOUCH_DATA)
71
71
  {
413
413
    goto err;
414
414
  }
415
415
 
416
 
  memcpy(share.state.header.file_version,(uchar*) myisam_file_magic,4);
 
416
  memcpy(share.state.header.file_version,myisam_file_magic,4);
417
417
  ci->old_options=options| (ci->old_options & HA_OPTION_TEMP_COMPRESS_RECORD ?
418
418
                        HA_OPTION_COMPRESS_RECORD |
419
419
                        HA_OPTION_TEMP_COMPRESS_RECORD: 0);
613
613
  }
614
614
  /* Create extra keys for unique definitions */
615
615
  offset=reclength-uniques*MI_UNIQUE_HASH_LENGTH;
616
 
  memset((char*) &tmp_keydef, 0, sizeof(tmp_keydef));
617
 
  memset((char*) &tmp_keyseg, 0, sizeof(tmp_keyseg));
 
616
  memset(&tmp_keydef, 0, sizeof(tmp_keydef));
 
617
  memset(&tmp_keyseg, 0, sizeof(tmp_keyseg));
618
618
  for (i=0; i < uniques ; i++)
619
619
  {
620
620
    tmp_keydef.keysegs=1;