into  four.local.lan:/work/trees/mysql-5.0-build-src-clean

into  four.local.lan:/work/merge/mysql-5.0-dev

   Bug#31030 rpl000015.test fails if $MYSQL_TCP_PORT != 3306
Note:
  This bug does not occur in MySQL 5.0 and up, because
  ChangeSet 1.2328.2.1 2006/11/27 for MySQL 5.0 prevents this.
  The 5.0 fix uses the environment variable DEFAULT_MASTER_PORT
  which is set by mysql-test-run.pl.
  mysql-test-run.pl in 4.1 does not set this variable.
  There are two alternatives:
  1) Backport the 5.0 fix for this test including modifications
     to mysql-test-run.pl and mysql-test-run-shell.
     This is a not acceptable impact on an old MySQL version.
  2) Fix the problem different than in 5.0 like in the current
     ChangeSet + do not apply these changes when upmerging to 5.0

into  mysql.com:/home/kent/bk/mac-os-x-universal/mysql-5.0-build

  Added 64 bit Mac OS X hard coded settings, for universal binaries

into  mysql.com:/home/kent/bk/mac-os-x-universal/mysql-5.0-build

into  mysql.com:/home/kent/bk/mac-os-x-universal/mysql-5.0-build

  Added 64 bit Mac OS X hard coded settings, for universal binaries

Disabled test case.

into  stella.local:/home2/mydev/mysql-5.0-axmrg

into  stella.local:/home2/mydev/mysql-5.0-axmrg

Disabled the test case.

into  mysql.com:/home/ram/work/b30495/b30495.5.0

into  stella.local:/home2/mydev/mysql-5.0-axmrg

into  hh-nb.hhunger:/work/merge/mysql-5.0-build

into  mysql.com:/home/ram/work/b30495/b30495.5.0

Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
Fixed wrong variable assignment.

Disabled test case

Another try to fix a compiler warning on win64.

into  stella.local:/home2/mydev/mysql-5.0-axmrg

into  mysql.com:/home/ram/work/b32560/b32560.5.0

Problem: INTERVAL function implementation doesn't handle NULL range values.

Fix: skip NULL ranges looking for a proper one.

into  stella.local:/home2/mydev/mysql-5.0-axmrg

Disabled test case

Disabled test case

Fixed a compiler warning on win64. Backport from 5.1.

Disabled test case

into  mysql.com:/home/kent/bk/docs-cleanup/mysql-5.0-build

into  mysql.com:/home/ram/work/b32558/b32558.5.0

  Include "manual.chm" in source TAR if it exists

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge

into  stella.local:/home2/mydev/mysql-5.0-axmrg

into  stella.local:/home2/mydev/mysql-5.0-axmrg

into  stella.local:/home2/mydev/mysql-4.1-axmrg

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build