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

  ndb_restore Return OK even if temporary errors
    (otherwise mysql-test-run/ndb_restore can fail on really slow machines)

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

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

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

  fix bug in test prg

  fix bug in handling of inactive timeout for scan, when all is delivered

into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.1-engines

into  may.pils.ru:/home/svoj/devel/bk/mysql-5.1-engines

into  mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-5.1-engines

into  mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-5.0-engines

into  mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-4.1-engines

This is addition to fix for bug21617. Valgrind reports an error when
opening merge table that has underlying tables with less indexes than
in a merge table itself.

Copy at most min(file->keys, table->key_parts) elements from rec_per_key array.
This fixes problems when merge table and subtables have different number of keys.

into  mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.1-engines

into  mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.0-engines

into  mysql.com:/home/svoj/devel/mysql/BUG10974/mysql-5.1-engines

into  mysql.com:/home/svoj/devel/mysql/BUG10974/mysql-5.0-engines

into  mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.1-engines

into  mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.0-engines

into  mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-4.1-engines

Though this is not storage engine specific problem, I was able to
repeat this problem with BDB and NDB engines only. That was the
reason to add a test case into ndb_update.test. As a result
different bad things could happen.

BDB has removed duplicate rows which is not expected.
NDB returns an error.

For multi table update notify storage engine about UPDATE IGNORE
as it is done in single table UPDATE.

into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug13987

Manually merge smaller 5.0 fix with fix-with-test and list sessions for 5.1

into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug13987

Merge 5.0-ndb into 5.1-ndb

  guess which scan type to use in handler

smaller patch for 5.0.

complete patch going to 5.1 due to more intrusiveness for 'list sessions' etc

Added license information display to output of plugins schema, and tagged all plugins with GPL flag. 

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

restore of the dump (ndb_dd_dump test) was failing for probably a merge problem. fixed now.

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

into  bk-internal.mysql.com:/dev/shm/knielsen/mysql-5.1-new-ndb

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

into  willster.(none):/home/stewart/Documents/MySQL/5.1/pending

into  xiphis.org:/home/antony/work2/p2-bug22080.3

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint