merge 5.1 => 5.5

1 files changed, 0 insertions, 11 deletions

diff --git a/sql/filesort.cc b/sql/filesort.cc
index c3250b6e699..8a0b37af339 100644
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -972,21 +972,10 @@ static void make_sortkey(register SORTPARAM *param,
       if (addonf->null_bit && field->is_null())
       {
         nulls[addonf->null_offset]|= addonf->null_bit;
-#ifdef HAVE_purify
-	bzero(to, addonf->length);
-#endif
       }
       else
       {
-#ifdef HAVE_purify
-        uchar *end= field->pack(to, field->ptr);
-	uint length= (uint) ((to + addonf->length) - end);
-	DBUG_ASSERT((int) length >= 0);
-	if (length)
-	  bzero(end, length);
-#else
         (void) field->pack(to, field->ptr);
-#endif
       }
       to+= addonf->length;
     }