← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/filesort.cc

  • Committer: Lee Bieber
  • Date: 2010-10-21 01:33:55 UTC
  • mfrom: (1864.1.3 build)
  • Revision ID: kalebral@gmail.com-20101021013355-uywuclusdprnf8nl
Merge Brian - Add support for --with-valgrind
Merge Mark - event_observer.h did not declare "class Session;" so it depended on being #include'ed after "session.h".
Merge Andrew - Fix bug #663554: drizzledump is not honoring --destination-database option
Merge Andrew - Fix bug #663812: drizzledump truncation for DOUBLE data type with no preset scale/precision

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