← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • 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:
drizzled/table.cc
179
179
                       &path_buff, path_length + 1,
180
180
                       NULL))
181
181
  {
182
 
    bzero((char*) share, sizeof(*share));
 
182
    memset((char*) share, 0, sizeof(*share));
183
183
 
184
184
    share->set_table_cache_key(key_buff, key, key_length);
185
185
 
244
244
                          const char *path)
245
245
{
246
246
 
247
 
  bzero((char*) share, sizeof(*share));
 
247
  memset((char*) share, 0, sizeof(*share));
248
248
  init_sql_alloc(&share->mem_root, TABLE_ALLOC_BLOCK_SIZE, 0);
249
249
  share->table_category=         TABLE_CATEGORY_TEMPORARY;
250
250
  share->tmp_table=              INTERNAL_TMP_TABLE;
582
582
  if (!(keyinfo = (KEY*) alloc_root(&share->mem_root,
583
583
                                    n_length + uint2korr(disk_buff+4))))
584
584
    goto err;                                   /* purecov: inspected */
585
 
  bzero((char*) keyinfo,n_length);
 
585
  memset((char*) keyinfo, 0, n_length);
586
586
  share->key_info= keyinfo;
587
587
  key_part= my_reinterpret_cast(KEY_PART_INFO*) (keyinfo+keys);
588
588
  strpos=disk_buff+6;
959
959
      }
960
960
      else
961
961
        charset= share->table_charset;
962
 
      bzero((char*) &comment, sizeof(comment));
 
962
      memset((char*) &comment, 0, sizeof(comment));
963
963
    }
964
964
 
965
965
    if (interval_nr && charset->mbminlen > 1)
1338
1338
  assert(thd->lex->is_lex_started);
1339
1339
 
1340
1340
  error= 1;
1341
 
  bzero((char*) outparam, sizeof(*outparam));
 
1341
  memset((char*) outparam, 0, sizeof(*outparam));
1342
1342
  outparam->in_use= thd;
1343
1343
  outparam->s= share;
1344
1344
  outparam->db_stat= db_stat;
1546
1546
  }
1547
1547
 
1548
1548
#if defined(HAVE_purify) 
1549
 
  bzero((char*) bitmaps, bitmap_size*3);
 
1549
  memset((char*) bitmaps, 0, bitmap_size*3);
1550
1550
#endif
1551
1551
 
1552
1552
  outparam->no_replicate= outparam->file &&
1655
1655
      my_free((uchar*) buf,MYF(0));
1656
1656
  }
1657
1657
  else if (!names)
1658
 
    bzero((char*) save_names,sizeof(save_names));
 
1658
    memset((char*) save_names, 0, sizeof(save_names));
1659
1659
  else
1660
1660
  {
1661
1661
    char *str;
1723
1723
        return(0);
1724
1724
      endpos-=bufflength; bufflength=IO_SIZE;
1725
1725
    }
1726
 
    bzero(buff,IO_SIZE);                        /* Null new block */
 
1726
    memset(buff, 0, IO_SIZE);                   /* Null new block */
1727
1727
    VOID(my_seek(file,(ulong) maxlength,MY_SEEK_SET,MYF(0)));
1728
1728
    if (my_write(file,buff,bufflength,MYF(MY_NABP+MY_WME)))
1729
1729
        return(0L);
2040
2040
  {
2041
2041
    uint key_length, tmp_key_length;
2042
2042
    uint tmp;
2043
 
    bzero((char*) fileinfo,64);
 
2043
    memset((char*) fileinfo, 0, 64);
2044
2044
    /* header */
2045
2045
    fileinfo[0]=(uchar) 254;
2046
2046
    fileinfo[1]= 1;
2109
2109
      61 for default_part_db_type
2110
2110
    */
2111
2111
    int2store(fileinfo+62, create_info->key_block_size);
2112
 
    bzero(fill,IO_SIZE);
 
2112
    memset(fill, 0, IO_SIZE);
2113
2113
    for (; length > IO_SIZE ; length-= IO_SIZE)
2114
2114
    {
2115
2115
      if (my_write(file,fill, IO_SIZE, MYF(MY_WME | MY_NABP)))
3179
3179
    bitmap_clear_all(&table->def_read_set);
3180
3180
    bitmap_clear_all(&table->def_write_set);
3181
3181
  */
3182
 
  bzero((char*) def_read_set.bitmap, s->column_bitmap_size*2);
 
3182
  memset((char*) def_read_set.bitmap, 0, s->column_bitmap_size*2);
3183
3183
  column_bitmaps_set(&def_read_set, &def_write_set);
3184
3184
}
3185
3185