Sort index sometimes failed wrongly with "Sort IDs broken" errors.

--HG--
branch : HEAD

diff --git a/src/lib-storage/index/index-sort-string.c b/src/lib-storage/index/index-sort-string.c
index dc17c83b71064becace24d354618bb73c5785f19..6f62529e22b52a1ff77e4ccc4ca6a36003422b56 100644 (file)
--- a/src/lib-storage/index/index-sort-string.c
+++ b/src/lib-storage/index/index-sort-string.c
@@ -613,7 +613,9 @@ index_sort_add_ids_range(struct sort_string_context *ctx,
                }
                nodes[i].sort_id_changed = TRUE;
        }
-       return right_str == NULL || strcmp(str, right_str) < 0 ? 0 : -1;
+       return right_str == NULL || strcmp(str, right_str) < 0 ||
+               (strcmp(str, right_str) == 0 &&
+                nodes[i-1].sort_id == right_sort_id) ? 0 : -1;
 }
 
 static int