← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/filesort.cc

  • Committer: Brian Aker
  • Date: 2010-10-20 20:25:52 UTC
  • mto: (1864.2.1 merge)
  • mto: This revision was merged to the branch mainline in revision 1865.
  • Revision ID: brian@tangent.org-20101020202552-51y5sz5ledoxbp7t
Add support for --with-valgrind

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/filesort.cc
919
919
      if (addonf->null_bit && field->is_null())
920
920
      {
921
921
        nulls[addonf->null_offset]|= addonf->null_bit;
922
 
#ifdef HAVE_purify
 
922
#ifdef HAVE_VALGRIND
923
923
        memset(to, 0, addonf->length);
924
924
#endif
925
925
      }
926
926
      else
927
927
      {
928
 
#ifdef HAVE_purify
 
928
#ifdef HAVE_VALGRIND
929
929
        unsigned char *end= field->pack(to, field->ptr);
930
 
        uint32_t length= (uint32_t) ((to + addonf->length) - end);
931
 
        assert((int) length >= 0);
932
 
        if (length)
933
 
          memset(end, 0, length);
 
930
        uint32_t local_length= (uint32_t) ((to + addonf->length) - end);
 
931
        assert((int) local_length >= 0);
 
932
        if (local_length)
 
933
          memset(end, 0, local_length);
934
934
#else
935
935
        (void) field->pack(to, field->ptr);
936
936
#endif