into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-bug20446

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

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

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

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

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

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

  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.0-engines

into  may.pils.ru:/home/svoj/devel/bk/mysql-5.0-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.0-engines

into  mysql.com:/home/svoj/devel/mysql/BUG10974/mysql-5.0-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

into  willster.(none):/home/stewart/Documents/MySQL/5.0/bug13987-5.0_bugfixonly

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.

smaller patch for 5.0.

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

into  mysql.com:/home/gluh/MySQL/Merge/5.0-kt

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

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

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real-bug21726-fix-2

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real-bug21726-fix

into  booka.:/home/alik/MySQL/devel/5.0-rt

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real-bug21726-fix

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

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

wrong results in order by in some rare cases.

invocations of LAST_INSERT_ID.

Reding of LAST_INSERT_ID inside stored function wasn't noted by caller,
and no LAST_INSERT_ID_EVENT was issued for binary log.

The solution is to add THD::last_insert_id_used_bin_log, which is much
like THD::last_insert_id_used, but is reset only for upper-level
statements.  This new variable is used to issue LAST_INSERT_ID_EVENT.

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0