into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

into lmy004.:/work/mysql-5.1-new-clean

the fix from 5.0 with necessary modifications applied.

into  mysql.com:/home/elkin/MySQL/MERGE/5.1-new

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

  Fix bootstrap/compile error

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb

into  perch.ndb.mysql.com:/home/jonas/src/50-work

  Handle early abort of scan, so that resources are correctly freed

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

- the replica info was not stored in byte order indepentent format
- backup/restore still compatible 5.0->5.1
- but patch makes previous 5.1 versions completely incompatible

1) relax version check for restore block since no changes has happend since 5.1.6
   and improve error message on check failure
   
2) improve lcp/backup max write size...

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

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

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

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb

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

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

into  mysql.com:/data0/knielsen/mysql-5.0-mtr-fix

into  mysql.com:/usr/local/mysql/mysql-5.0-mtr-fix

- this behavior was already changed, adding testcase

into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new

into lmy004.:/work/mysql-5.1-new-clean

into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new

Merge by hand.  This may not be right.

- changed alter tablespace truct to work with handlerton pointer (to avoid crash in parser on unknown db type"
- pushed warnings when default storage engine is used and/or tablespace stuff is not supported by storage engine

into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.1-new