~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Nathan Williams
  • Date: 2009-06-26 19:37:44 UTC
  • mfrom: (1076 staging)
  • mto: This revision was merged to the branch mainline in revision 1082.
  • Revision ID: nathanlws@gmail.com-20090626193744-i9zek83am2craqz6
Merged trunk, resolved conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
2706
2706
          We have to reserve one byte here for NULL bits,
2707
2707
          as this is updated by 'end_update()'
2708
2708
        */
2709
 
        *pos++= NULL;                           // Null is stored here
 
2709
        *pos++= '\0';                           // Null is stored here
2710
2710
        recinfo->length= 1;
2711
2711
        recinfo->type=FIELD_NORMAL;
2712
2712
        recinfo++;