bk commit into 5.1 tree (gkodinov:1.2377)

[kgeorge]

Below is the list of changes that have just been committed into a local
5.1 repository of kgeorge. When kgeorge does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-22 12:50:58+02:00, gkodinov@stripped +1 -0
  Merge macbook.gmz:/Users/kgeorge/mysql/work/mysql-5.0-opt
  into  macbook.gmz:/Users/kgeorge/mysql/work/merge-5.1-opt
  MERGE: 1.1810.1698.193

  sql/filesort.cc@stripped, 2006-11-22 12:50:47+02:00, gkodinov@stripped +0 -0
    Auto merged
    MERGE: 1.105.1.4

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gkodinov
# Host:	macbook.gmz
# Root:	/Users/kgeorge/mysql/work/merge-5.1-opt/RESYNC

--- 1.116/sql/filesort.cc	2006-11-17 16:29:32 +02:00
+++ 1.117/sql/filesort.cc	2006-11-22 12:50:47 +02:00
@@ -1050,7 +1050,7 @@ uint read_to_buffer(IO_CACHE *fromfile, 
     Put all room used by freed buffer to use in adjacent buffer.  Note, that
     we can't simply distribute memory evenly between all buffers, because
     new areas must not overlap with old ones.
-  SYNOPSYS
+  SYNOPSIS
     reuse_freed_buff()
     queue      IN  list of non-empty buffers, without freed buffer
     reuse      IN  empty buffer