From: Martin Mares <mj@ucw.cz>
Date: Thu, 6 Sep 2007 19:26:49 +0000 (+0200)
Subject: Fixed multi-way sorting with custom presorting.
X-Git-Tag: holmes-import~506^2~13^2~54
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=d3b0fd52103d46da06081ea01c98df78bf1854f0;p=libucw.git

Fixed multi-way sorting with custom presorting.
---

diff --git a/lib/sorter/govern.c b/lib/sorter/govern.c
index f761eb7d..97ef0442 100644
--- a/lib/sorter/govern.c
+++ b/lib/sorter/govern.c
@@ -226,7 +226,7 @@ sorter_multiway(struct sort_context *ctx, struct sort_bucket *b)
 
   if (part_cnt <= 1)
     {
-      sh_off_t size = sbuck_ins_or_join(clist_head(&parts), list_pos, join, join_size);
+      sh_off_t size = sbuck_ins_or_join(clist_head(&parts), list_pos, (part_cnt ? NULL : join), join_size);
       SORT_XTRACE(trace_level, "Sorted in memory (%s, %dMB/s)", stk_fsize(size), sorter_speed(ctx, size));
       return;
     }