into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

into mysql.com:/home/pem/work/mysql-5.0

  and BUG#9074: STORED PROC: The scope of every handler declared is not properly applied

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

into deer.(none):/home/hf/work/mysql-5.0.errmsg

into mysql.com:/home/my/mysql-5.0

into neptunus.(none):/home/msvensson/mysql/mysql-5.0

  has branched off from the 4.1 tree to build the 5.0.4 release

into mysql.com:/home/my/mysql-5.0

into neptunus.(none):/home/msvensson/mysql/mysql-4.1

into neptunus.(none):/home/msvensson/mysql/mysql-5.0

 - Removed hardcoded error message from 4.1

into mysql.com:/home/my/mysql-5.0

Fixed warnings by valgrind for sum_distinct.test
Enable buffered-record-reads after filesort for InnoDB tables with short primary key
Enabled sort-with-data for MyISAM temporary files

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

into deer.(none):/home/hf/work/mysql-5.0.errmsg

into deer.(none):/home/hf/work/mysql-5.0.errmsg

into mysql.com:/home/psergey/mysql-5.0-bug8877-merge

into mysql.com:/home/psergey/mysql-4.1-bug8877

into mysql.com:/home/psergey/mysql-5.0-bug8877-merge

into msdesk.mysql.com:/home/magnus/mysql-5.0

into msdesk.mysql.com:/home/magnus/mysql-5.0

 - See article http://archive.netbsd.se/?ml=freebsd-current&a=2004-07&m=257561
  or http://www.geocrawler.com/archives/3/254/2003/3/450/10409564/

  After merge fix.