← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Brian Aker
  • Date: 2008-07-30 17:24:10 UTC
  • mfrom: (236.1.6 codestyle)
  • Revision ID: brian@tangent.org-20080730172410-t4r8o7lx7r9m95x7
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
11327
11327
    recinfo->type=FIELD_NORMAL;
11328
11328
    recinfo->length=null_pack_length;
11329
11329
    recinfo++;
11330
 
    bfill(null_flags,null_pack_length,255);     // Set null fields
 
11330
    memset(null_flags, 255, null_pack_length);  // Set null fields
11331
11331
 
11332
11332
    table->null_flags= (uchar*) table->record[0];
11333
11333
    share->null_fields= null_count+ hidden_null_count;
11829
11829
    recinfo->type=FIELD_NORMAL;
11830
11830
    recinfo->length=null_pack_length;
11831
11831
    recinfo++;
11832
 
    bfill(null_flags,null_pack_length,255);     // Set null fields
 
11832
    memset(null_flags, 255, null_pack_length);  // Set null fields
11833
11833
 
11834
11834
    table->null_flags= (uchar*) table->record[0];
11835
11835
    share->null_fields= null_count;
12812
12812
  // 2. Zero the null bytes 
12813
12813
  if (sjtbl->null_bytes)
12814
12814
  {
12815
 
    bzero(ptr, sjtbl->null_bytes);
 
12815
    memset(ptr, 0, sjtbl->null_bytes);
12816
12816
    ptr += sjtbl->null_bytes; 
12817
12817
  }
12818
12818
 
12824
12824
    {
12825
12825
      /* It's a NULL-complemented row */
12826
12826
      *(nulls_ptr + tab->null_byte) |= tab->null_bit;
12827
 
      bzero(ptr + tab->rowid_offset, h->ref_length);
 
12827
      memset(ptr + tab->rowid_offset, 0, h->ref_length);
12828
12828
    }
12829
12829
    else
12830
12830
    {