into  siva.hindu.god:/usr/home/tim/m/bk/global-50

into  mysql.com:/home/hf/work/mysql-5.0.mrg

into  trift2.:/M50/merge-4.1-to-5.0

into  trift2.:/M50/merge-4.1-to-5.0

into  trift2.:/M50/merge-4.1-to-5.0

into  trift2.:/M50/merge-4.1-to-5.0

into  mysql.com:/usr/home/ram/work/4.1.b16327

into  xiphis.org:/home/antony/work2/merge/mysql-5.0

- Adapt it to work with the handlerton class

into  mysql.com:/home/hf/work/mysql-4.1.19983

into  salvation.intern.azundris.com:/home/tnurnberg/mysql-5.0

 - backport patch from 5.0
 - "table" can be NULL in temporary fields used for type conversion

into  salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.0-merge

REPLACE ... SELECT would require INSERT privileges on certain tables
when SELECT really suffices. Require INSERT only on target table.

Post merge changes.

  Added new "mysql_explain_log" man page
  Added missing install of "myisam_ftdump" man page
  Added missing install of "mysqlman" man page

into  govinda.patg.net:/home/patg/mysql-build/mysql-5.0-bug18764.2

into  moonbone.local:/work/tmp_merge-5.0-opt-mysql

into  moonbone.local:/work/tmp_merge-4.1-opt-mysql

into  moonbone.local:/work/tmp_merge-5.0-opt-mysql

into  moonbone.local:/work/tmp_merge-4.1-opt-mysql

into  rama.(none):/home/jimw/my/mysql-5.0-17608

into  moonbone.local:/work/tmp_merge-5.0-opt-mysql

into  production.mysql.com:/usersnfs/abotchkov/mysql-5.0.mrg

Please use "ul" when merging this changeset to 5.0.

into  mysql.com:/home/hf/work/mysql-5.0.mrg

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

Removed logic in ha_federated::write_row, which checks field query ids in the
loop which builds the query to run on the remote server.

into  rurik.mysql.com:/home/igor/mysql-5.0-opt

into  olga.mysql.com:/home/igor/mysql-5.0-opt

1) When initializing a boolean variable, do not use string representations '"false"' and '"true"' 
    but rather the boolean values 'false' and 'true'.
2) Add the module to the various Windows description files.

In 5.0, this is already solved, so that is a null-merge ("ul").

  Test case for bug#10977 altered to make it work in both plain and ps-protocol modes.

  Corrected the test case after fixing bug#10977

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