← Back to branch summary

~jaypipes/drizzle/item-class-file-reorg

« back to all changes in this revision

Viewing changes to storage/myisam/myisampack.c

  • Committer: Brian Aker
  • Date: 2008-07-29 07:47:38 UTC
  • mfrom: (212.6.1 bzero-memset)
  • Revision ID: brian@tangent.org-20080729074738-lfzim6htapm42f2o
Merge from Mats

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/myisampack.c
618
618
  if (!error && !test_only)
619
619
  {
620
620
    uchar buff[MEMMAP_EXTRA_MARGIN];            /* End marginal for memmap */
621
 
    bzero(buff,sizeof(buff));
 
621
    memset(buff, 0, sizeof(buff));
622
622
    error=my_write(file_buffer.file,buff,sizeof(buff),
623
623
                   MYF(MY_WME | MY_NABP | MY_WAIT_IF_FULL)) != 0;
624
624
  }
1113
1113
  uint space_fields,fill_zero_fields,field_count[(int) FIELD_enum_val_count];
1114
1114
  my_off_t old_length,new_length,length;
1115
1115
 
1116
 
  bzero((uchar*) field_count,sizeof(field_count));
 
1116
  memset((uchar*) field_count, 0, sizeof(field_count));
1117
1117
  space_fields=fill_zero_fields=0;
1118
1118
 
1119
1119
  for (; trees-- ; huff_counts++)
1944
1944
{
1945
1945
  uchar *buff= (uchar*) file_buffer.pos;
1946
1946
 
1947
 
  bzero(buff,HEAD_LENGTH);
 
1947
  memset(buff, 0, HEAD_LENGTH);
1948
1948
  memcpy_fixed(buff,myisam_pack_file_magic,4);
1949
1949
  int4store(buff+4,head_length);
1950
1950
  int4store(buff+8, mrg->min_pack_length);