into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work

mysql-test/lib/mtr_unique.pl:
  - add info message to mtr_require_unique_id_and_wait as suggested
  - fix for security issue
  - locks for pids of processes that don't exist anymore are reused, if ps is present and working as expected

into  mysql.com:/home/df/mysql/build/mysql-5.1-build


mysql-test/mysql-test-run.pl:
  Auto merged

mysql-test/lib/mtr_unique.pl:
  Library file used by mysql-test-run.pl to determine unique test run identifiers.

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M50/push-5.0

into  trift2.:/MySQL/M41/push-4.1

into  trift2.:/MySQL/M50/push-5.0

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M51/push-5.1

into  trift2.:/MySQL/M51/bug22081-5.1


support-files/mysql.spec.sh:
  SCCS merged

into  trift2.:/MySQL/M50/push-5.0

into  trift2.:/MySQL/M50/bug22081-5.0


support-files/mysql.spec.sh:
  Manual merge, bug#22081.

support-files/mysql.spec.sh:
  Explicitly note that the "MySQL-shared" RPMs (as built by MySQL AB) replace 
  "mysql-shared" (as distributed by SuSE) to allow easy upgrading (bug#22081).

into  trift2.:/MySQL/M51/bug22081-5.1

into  romeo.(none):/home/bk/memcheck-mysql-5.1


sql/sql_class.cc:
  Auto merged

into  trift2.:/MySQL/M51/spec-mtr-5.1


support-files/mysql.spec.sh:
  Null-merge, as the 5.1 version already calls "mysql-test-run"
  and uses "report features".

into  trift2.:/MySQL/M50/clone-5.0

into  trift2.:/MySQL/M50/push-5.0

into  trift2.:/MySQL/M50/spec-mtr-5.0


support-files/mysql.spec.sh:
  Use "report features" (manual merge).

support-files/mysql.spec.sh:
  Switch from "make test*" to explicit calls of the test suite, so that "report features" can be used.

Adding class to handle temporary allocate of memory during write of rows.
Eliminating cut'n-paste error between THD::binlog_{write,update,delete}_row().


sql/sql_class.cc:
  Adding class to handle temporary allocate of memory during write of rows.
  Eliminating cut'n-paste error between THD::binlog_{write,update,delete}_row().

into  mysql.com:/home/bk/MERGE/mysql-5.1-merge


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~2f6eabb2f69cb33d:
  Auto merged
BitKeeper/deleted/.del-make_win_bin_dist:
  Auto merged
client/mysql.cc:
  Auto merged
sql/log.cc:
  Auto merged
configure.in:
  Manual merge, main clone 5.0->5.1

into  mysql.com:/home/bk/MERGE/mysql-5.0-merge

into  mysql.com:/home/bk/MERGE/mysql-5.1-merge

into  mysql.com:/home/bk/MERGE/mysql-5.0-merge

into  mysql.com:/home/bk/MERGE/mysql-5.1-merge

into  mysql.com:/home/bk/MERGE/mysql-5.0-merge

into  mysql.com:/home/bk/MERGE/mysql-4.1-merge

into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl

into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0

mending windows test.


mysql-test/r/rpl_packet.result:
  results changed
mysql-test/t/rpl_packet.test:
  removing because of the connection with windows client can be lost instead of
  the error code back (source: manual).

into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0

into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0

into  kahlann.erinye.com:/home/df/mysql/build/51


scripts/make_binary_distribution.sh:
  Auto merged

into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0


scripts/make_binary_distribution.sh:
  SCCS merged