into kriem.kemuri.org:/home/geert/MySQL/mysql-5.0

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.

state" to sp-error.test.

According to Per-Erik all SP related tests which should result in error
should go into sp-error.test and not in sp.test, because we want to be
able to run sp.test using normal client.

into mysql.com:/home/dlenev/src/mysql-5.0-bg9566

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

illegal state".

We should not assume that mysql.proc table does not exist if we are
unable to open it under LOCK TABLES or in prelocked mode (and
remember this fact by setting mysql_proc_table_exists to zero).