bk commit into 5.1 tree (jonas:1.2206)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-05-02 18:28:35+02:00, jonas@stripped +2 -0
  ndb - drop6p16

  cluster_change_hist.txt@stripped, 2008-05-02 18:28:34+02:00, jonas@stripped +11 -0
    update change hist

  configure.in@stripped, 2008-05-02 18:28:34+02:00, jonas@stripped +2 -2
    bump version

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/drop6

--- 1.348/configure.in	2008-05-02 18:28:37 +02:00
+++ 1.349/configure.in	2008-05-02 18:28:37 +02:00
@@ -7,7 +7,7 @@
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # Don't forget to also update the NDB lines below.
-AM_INIT_AUTOMAKE(mysql, 5.2.2-a_drop6p15)
+AM_INIT_AUTOMAKE(mysql, 5.2.2-a_drop6p16)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10
@@ -19,7 +19,7 @@
 NDB_VERSION_MAJOR=5
 NDB_VERSION_MINOR=2
 NDB_VERSION_BUILD=2
-NDB_VERSION_STATUS="a_drop6p15"
+NDB_VERSION_STATUS="a_drop6p16"
 
 # Set all version vars based on $VERSION. How do we do this more elegant ?
 # Remember that regexps needs to quote [ and ] since this is run through m4

--- 1.36/cluster_change_hist.txt	2008-05-02 18:28:37 +02:00
+++ 1.37/cluster_change_hist.txt	2008-05-02 18:28:37 +02:00
@@ -13,6 +13,17 @@
 
 -------------------------------
 
+Alcatel Drop 6p16 (Fri 2 May 2008)
+   issue#23497: add printouts if resend takes longer than 3s
+   issue#24424: (this is fixed addressed in other clones)
+     bug#36199: Master failure during master_lcp can lead to node failure
+     bug#36245: NF_COMPLETEREP can get lost if new master dies before sending it
+     bug#36246: Incorrect handling of TC-TakeOver in cascading master failure
+     bug#36247: Incorrect handling of LQH_TRANSREQ with cascading master failure
+     bug#36276: Race condition between EMPTY_LCPCONF and MASTER_LCPREQ
+
+-------------------------------
+
 Alcatel Drop 6p15 (Fri 14 March 2008)
 
      *bug#35241 Out of REDO log due to incorrectly handled stopped node