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

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).

into serg.mylan:/usr/home/serg/Abk/mysql-5.0

Gluh's SESSION/GLOBAL for @variables fix in sql_yacc.yy and
Bar's well_formed_len() changes in ndb code
did not make it and should be re-applied manually

into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-new

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

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

into mysql.com:/media/sda1/mysql/mysql-5.0-9520

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile

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

Added suppression file for some valgrind warnings that are not real errors

between two server instances at server shutdown/startup.
This conflict on advisory locks appears to be the result of a bug
in the operating system; these locks should be released when the
files are closed, but somehow that does not always happen
immediately in Linux.  (Bug #9381)

into mysql.com:/Users/kent/mysql/bk/mysql-4.1