bk commit into 5.1 tree (jonas:1.2086)

[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, 2007-01-10 17:28:10+01:00, jonas@eel.(none) +4 -0
  drop5p17b -
    recommit version handling in correct clone :-(

  cluster_change_hist.txt@stripped, 2007-01-10 17:28:07+01:00, jonas@eel.(none) +7 -0
    recommit in correct clone :-(

  configure.in@stripped, 2007-01-10 17:28:07+01:00, jonas@eel.(none) +2 -2
    recommit in correct clone :-(

  storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp@stripped, 2007-01-10 17:28:07+01:00,
jonas@eel.(none) +7 -0
    recommit in correct clone :-(

  storage/ndb/src/ndbapi/ClusterMgr.cpp@stripped, 2007-01-10 17:28:07+01:00, jonas@eel.(none)
+11 -1
    recommit in correct clone :-(

# 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:	eel.(none)
# Root:	/home/jonas/src/mysql-5.1-wl2325-5.0

--- 1.324/configure.in	2007-01-10 17:28:16 +01:00
+++ 1.325/configure.in	2007-01-10 17:28:16 +01: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.1.3-a_drop5p17)
+AM_INIT_AUTOMAKE(mysql, 5.1.3-a_drop5p17b)
 AM_CONFIG_HEADER(config.h)
 
 PROTOCOL_VERSION=10
@@ -19,7 +19,7 @@
 NDB_VERSION_MAJOR=5
 NDB_VERSION_MINOR=1
 NDB_VERSION_BUILD=3
-NDB_VERSION_STATUS="a_drop5p17"
+NDB_VERSION_STATUS="a_drop5p17b"
 
 # 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.10/cluster_change_hist.txt	2007-01-10 17:28:16 +01:00
+++ 1.11/cluster_change_hist.txt	2007-01-10 17:28:16 +01:00
@@ -9,7 +9,14 @@
 (note that this does not apply to the not yet released Alcatel features for Partitioning
and Replication)
 (* == Alcatel has hit this bug)
 
+-------------------------------
 
+Alcatel Drop 5p17b (Tue: 9 Jan 2007)
+
+As drop5p17 with additional bug fixed:
+
+   * Fix online software upgrade with version <= 16
+     Possibility to upgrade in any order
 
 -------------------------------
 

--- 1.33/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2007-01-10 17:28:16 +01:00
+++ 1.34/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2007-01-10 17:28:16 +01:00
@@ -2689,6 +2689,13 @@
   NodeVersionInfo info = getNodeVersionInfo();
   apiRegConf->minDbVersion = info.m_type[NodeInfo::DB].m_min_version;
   apiRegConf->nodeState.m_connected_nodes.assign(c_connectedNodes);
+  
+  if (version < NDBD_NODE_VERSION_REP)
+  {
+    Uint32* ptr = (Uint32*)&apiRegConf->nodeState;
+    memmove(ptr - 1, ptr, sizeof(NodeState));
+  }
+
   sendSignal(ref, GSN_API_REGCONF, signal, ApiRegConf::SignalLength, JBB);
 
   if (apiNodePtr.p->phase == ZAPI_INACTIVE &&

--- 1.26/storage/ndb/src/ndbapi/ClusterMgr.cpp	2007-01-10 17:28:16 +01:00
+++ 1.27/storage/ndb/src/ndbapi/ClusterMgr.cpp	2007-01-10 17:28:16 +01:00
@@ -319,7 +319,17 @@
 					      node.m_info.m_version);
   }
 
-  node.m_state = apiRegConf->nodeState;
+  if (node.m_info.m_version < NDBD_NODE_VERSION_REP)
+  {
+    Uint32* ptr = (Uint32*)&apiRegConf->nodeState;
+    ptr--;
+    node.m_state = *(NodeState*)ptr;
+  }
+  else
+  {
+    node.m_state = apiRegConf->nodeState;
+  }
+
   if (node.compatible && (node.m_state.startLevel == NodeState::SL_STARTED  ||
 			  node.m_state.startLevel == NodeState::SL_SINGLEUSER)){
     set_node_alive(node, true);