into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0

Bug #21072  Duplicate key error in NDB references wrong key: use MAX_KEY to signal unknown key: Added string initialization

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0

update federated for fix

into  willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0

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

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

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug9678

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

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

  note this does not happen in 5.0, but i'm committing it here to keep code same between 5.0 and 5.1

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

  Fix race-condition between COPY_GCIREQ (GCP) and lcpSetActiveStatusEnd
  Solution is _not_ to copy sysfileData from COPY_GCIREQ from "self"

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

  Add checking of REDO to earlier during SR
      so take-over of node can be performed
      if it can't be restarted using logs
      (which btw is really weird...as it _should_ be able to use logs of other node in node group)

  Otherwise cluster could be started and 1 fragment on one node could not have been restored
  Making the cluster inconsisten, VERY BAD

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