into  chilla.local:/home/mydev/mysql-5.0-bug20719

into  chilla.local:/home/mydev/mysql-5.0-bug20719

After merge fix

into  chilla.local:/home/mydev/mysql-5.0-bug20719

After merge fix

into  chilla.local:/home/mydev/mysql-5.0-bug20719

into  chilla.local:/home/mydev/mysql-4.1-bug20719

Added HA_NULL_IN_KEY to table flags to allow for nullable unique indexes
and added test to verify

ha_federated.h:
  BUG #15133 "unique index with nullable value not accepted in federated table"
  added HA_NULL_IN_KEY to table flags to allow for nullable unique indexes
federated.test:
  BUG #15133 "unique index with nullable value not accepted in federated table"
  New test to show that nullable unique indexes work
federated.result:
  BUG #15133 "unique index with nullable value not accepted in federated table"
  New results for new test

into  chilla.local:/home/mydev/mysql-4.1

into  chilla.local:/home/mydev/mysql-5.0

Fixed a possible problem with reading of dynamic records
when a write cache is active. The cache must be flushed
whenever a part of the file in the write cache is to be 
read.

Added a read optimization to _mi_read_dynamic_record().

No test case. This was a hypothetical but existing problem.

Post merge changes.

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

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

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.

  The Federated storage engine used Field methods that had arbitrary limits on
  the amount of data they could process, which caused problems with data
  over that limit (4K). By removing those Field methods and just using
  features of the String class, we can avoid this problem.

into  dl145k.mysql.com:/data0/mkindahl/bk/mysql-5.0-rpl

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

 Changed the error reporting (and a crash) when inserting data into a
 MERGE table that has no underlying tables or no INSERT_METHOD specified
 by reporting that it is read-only.

into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41

into  chilla.local:/home/mydev/mysql-5.0-amerge

into  trift2.:/M50/mysql-5.0

into  dl145k.mysql.com:/data0/mkindahl/bk/MERGE/mysql-5.0-merge

into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41

into  trift2.:/M50/mysql-5.0

into  gbichot3.local:/home/mysql_src/mysql-5.0

into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-1.2167.1.2

fails"

into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50