*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 4e61fcaac74e06b63be625d26880aa1376e76ef9..1bb0f9816e60e322a9f01de9cf84eb23c073e868 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,19 @@
        * man/pwd.x, man/echo.x, man/printf.x: Fix typo:
        s/supercede/supersede/ reported by Andrew Fabbro.
 
+2004-05-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Improve performance of `sort -m' on large files, at the cost of
+       making some contrived examples unsafe.  POSIX allows this
+       optimization.  Performance problem reported by Jonathan Baker in
+       <http://mail.gnu.org/archive/html/bug-coreutils/2004-05/msg00071.html>.
+
+       * src/sort.c (first_same_file): Do not treat input pipes
+       differently from other files.
+       * doc/coreutils.texi (sort invocation): Document that "sort -m -o F"
+       might write F before reading all the input.
+       * NEWS: Likewise.
+
 2004-05-12  Paul Eggert  <eggert@cs.ucla.edu>
 
        * src/od.c (print_ascii, dump_strings): Use e.g. '\a' rather than