Still leakage, make sure all unlinked operations are put back so they will be release
  (on failing blob operations, when AO_IgnoreError)


ndb/src/ndbapi/NdbConnection.cpp:
  Still leakage, make sure all unlinked operations are put back so they will be release

  Fix some too small buffers in backup
  


ndb/include/kernel/ndb_limits.h:
  backport for 5.1
  add MAX_WORDS_META_FILE for computing Backup::NO_OF_PAGES_META_FILE
ndb/src/kernel/blocks/backup/Backup.cpp:
  Make sure to set maxInsert so that we actually can handle NO_OF_META_PAGES
ndb/src/kernel/blocks/backup/Backup.hpp:
  backport for 5.1
  add MAX_WORDS_META_FILE for computing Backup::NO_OF_PAGES_META_FILE

  Fixed a 4.1/5.0 vs. 5.1 name change in latest SR bug fix


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Fixed a 4.1/5.0 vs. 5.1 name change in latest SR bug fix

  Fix monster SR bug making SR with ordered indexes (or temporary tables) broken


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Fix monster SR bug making SR with ordered indexes (or temporary tables) broken

  Make sure postExecute is not run for blobs if AO_IgnoreError


ndb/src/ndbapi/NdbConnection.cpp:
  If AO_IgnoreError, error codes arent always set on individual operations, making postExecute impossible

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


ndb/src/kernel/blocks/ERROR_codes.txt:
  Add error insert for dealying of copy sysfileData
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  1) Add error insert for delaying of sysfileData
  2) Change to that master is _not_ copying sysfileData from COPY_GCIREQ
     as it might be updating it while COPY_GCIREQ is "in the fly"

  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


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Break-out methods which searches for REDO for a fragment, so it can be used earlier during SR
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  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)

    Make sure checkKeepGci is also run on oldStoredReplicas
      to prevent keepgci to move backwards when crash node restarts


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Make sure checkKeepGci is also run on oldStoredReplicas
    to prevent keepgci to move backwards when crash node restarts

  Fix take-over during SR, remove coupling to lcp/gcp (if systemRestartOngoing())


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Fix take-over during SR

  handle also CS_CONNECTED as "abort" in handleFailedApi to keep from falling on assertion in releaseApiCon
    in case of committed dirtyRead


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  handle also CS_CONNECTED as "abort" to keep from falling on assertion in releaseApiCon
    in case of committed dirtyRead

  Fix occational LCP hang!!!
  Make sure only to consider alive nodes in startNextChkpt


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Make sure only to consider alive nodes in startNextChkpt

  Fix for alter table when node is down...that could cause pain and misery


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Make sure to check table version before retriving from disk

  fix deadlock if master switches log file in parallell with "show master logs"
  


sql/log.cc:
  add raw_get_current_log which dont take log mutex
sql/sql_class.h:
  add raw_get_current_log which dont take log mutex
sql/sql_repl.cc:
  Fix lock order i.e first log_lock then index_lock

  read TransactionDeadlockTimeout (for scans) to cater for insane settings


ndb/src/ndbapi/NdbScanOperation.cpp:
  read TransactionDeadlockTimeout to cater for insane settings

  Make sure updateNodeInfo is run on master also for temporary tables


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Run update nodeinfo also here to handle
    temprorary tables in some situations
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  new error insert
ndb/test/ndbapi/testSystemRestart.cpp:
  test case

  Make sure totSendlenAi is set in case of ACC_ABORTCONF and activeCreate == true
  (only needed when >2 replica)


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Make sure totSendlenAi is set in case of ACC_ABORTCONF and activeCreate == true

  Fix error message on copyfragref


ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Fix error message

  Fix docs for NdbOpertation::sub_reg


ndb/include/ndbapi/NdbOperation.hpp:
  Fix docs for sub_reg

   Make sure that tupkeyErrorLab is run if interpretedUpdate(fail), so that entry is not inserted into index.
     Yeilding crash on following dml on tupel



ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Make sure that tupkeyErrorLab is run if interpretedUpdate(fail), so that entry is not inserted into index.
        Yeilding crash on following dml on tupe

  Fix bug in tup buddy allocator, which made it make invalid access to cfreepagelist[16] (which is not defined)


ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
  loop from firstListToCheck -1 (as firstListToCheck has already been checked), when looking for less than requested pages
  add if-statement for firtListToCheck == 0

  Make possible to build both debug/release from compile-ndb-autotest


BUILD/compile-ndb-autotest:
  Make possible to build both debug/release from compile-ndb-autotest

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

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


ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

  handle error in TCKEYREQ during TCINDXREQ better


ndb/src/kernel/blocks/ERROR_codes.txt:
  new error code
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Add 3 values to isIndexOp
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  handle error in TCKEYREQ during TCINDXREQ
ndb/test/ndbapi/testIndex.cpp:
  Add testcase
ndb/test/run-test/daily-basic-tests.txt:
  Add testcase

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

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

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

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

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-4.1-merge

into  mysql.com:/Users/kent/mysql/bk/mysql-4.1


configure.in:
  Auto merged

  Corrected typo


configure.in:
  Corrected typo

into  mysql.com:/Users/kent/mysql/bk/mysql-4.1


configure.in:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
support-files/mysql.spec.sh:
  SCCS merged

  Man page for mysqld command move to section 8 (bug#21220)


configure.in:
  Man page for mysqld command move to section 8 (bug#21220)
man/Makefile.am:
  Man page for mysqld command move to section 8 (bug#21220)

  Man page for "mysqld" command move to section 8 (bug#21220)


scripts/make_binary_distribution.sh:
  Man page for "mysqld" command move to section 8 (bug#21220)

  Man page for "mysqld" command move to section 8 (bug#21220)


support-files/mysql.spec.sh:
  Man page for "mysqld" command move to section 8 (bug#21220)

Too many cursors (more than 1024) could lead to memory corruption.
This affects both, stored routines and C API cursors, and the
threshold is per-server, not per-connection.  Similarly, the
corruption could happen when the server was under heavy load
(executing more than 1024 simultaneous complex queries), and this is
the reason why this bug is fixed in 4.1, which doesn't support
cursors.

The corruption was caused by a bug in the temporary tables code, when
an attempt to create a table could lead to a write beyond allocated
space.  Note, that only internal tables were affected (the tables
created internally by the server to resolve the query), not tables
created with CREATE TEMPORARY TABLE.  Another pre-condition for the
bug is TRUE value of --temp-pool startup option, which, however, is a
default.

The cause of a bug was that random memory was overwritten in
bitmap_set_next() due to out-of-bound memory access.


mysys/my_bitmap.c:
  Local 'bitmap_size' is measured in bytes, no need to multiply it by 8.
sql/sql_select.cc:
  Clear the temp_pool_slot bit only if we have set it previously.

innobase/ibuf/ibuf0ibuf.c:
  Applied innodb-4.1-ss32 snapshot.
   ibuf_fixed_addr_page(): Add parameter space. As the insert
   buffer B-tree is only located in the system tablespace
   (space 0), IBUF_TREE_ROOT_PAGE_NO is only special in space 0.

into  trift2.:/M41/push-4.1

into  trift2.:/M41/push-4.1


sql/field.cc:
  Auto merged
sql/sql_locale.cc:
  Changes were already present (and even better) == Null-merge == "ul".