summaryrefslogtreecommitdiff
path: root/sql/filesort.cc
diff options
context:
space:
mode:
authorTor Didriksen <tor.didriksen@oracle.com>2011-08-25 10:38:07 +0200
committerTor Didriksen <tor.didriksen@oracle.com>2011-08-25 10:38:07 +0200
commitdb065d2719c6997a8bac68d980b14c4212cddc3d (patch)
treecbf209bb48290251851f20c86ca7198535336530 /sql/filesort.cc
parent2529effa80aec846ee8b496012d8c54774f54aeb (diff)
downloadmariadb-git-db065d2719c6997a8bac68d980b14c4212cddc3d.tar.gz
Bug#12856915 VALGRIND FAILURE IN FILESORT/CREATE_SORT_INDEX
Suppress the known warnings generated by filesort(). The real fix belongs to worklog 1509: Pack values of non-sorted fields in the sort buffer (which is basically the same issue, but in an optimization context: We are writing the entire sort buffer to disk, including un-used space for varchar columns.)
Diffstat (limited to 'sql/filesort.cc')
-rw-r--r--sql/filesort.cc11
1 files changed, 0 insertions, 11 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc
index 99e5156427a..0ff354b334c 100644
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -959,21 +959,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;
}