bk commit into 5.1 tree (tomas:1.2416)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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
  1.2416 07/02/14 12:38:07 tomas@stripped +2 -0
     bump up version to ndb-6.1.3
     correction of manual merge

  storage/ndb/src/ndbapi/TransporterFacade.cpp
    1.58 07/02/14 12:37:59 tomas@stripped +2 -1
    correction of manual merge

  configure.in
    1.426 07/02/14 12:37:58 tomas@stripped +2 -2
    bump up version to ndb-6.1.3

# 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:	tomas
# Host:	poseidon.mysql.com
# Root:	/home/tomas/mysql-5.1-telco-6.1_2

--- 1.425/configure.in	2007-02-08 03:03:13 +07:00
+++ 1.426/configure.in	2007-02-14 12:37:58 +07:00
@@ -7,12 +7,12 @@ AC_INIT(sql/mysqld.cc)
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # remember to also update version.c in ndb
-AM_INIT_AUTOMAKE(mysql, 5.1.15-ndb-6.1.2)
+AM_INIT_AUTOMAKE(mysql, 5.1.15-ndb-6.1.3)
 AM_CONFIG_HEADER(config.h)
 
 NDB_VERSION_MAJOR=6
 NDB_VERSION_MINOR=1
-NDB_VERSION_BUILD=2
+NDB_VERSION_BUILD=3
 NDB_VERSION_STATUS="-beta"
 
 PROTOCOL_VERSION=10

--- 1.57/storage/ndb/src/ndbapi/TransporterFacade.cpp	2006-12-27 16:58:06 +07:00
+++ 1.58/storage/ndb/src/ndbapi/TransporterFacade.cpp	2007-02-14 12:37:59 +07:00
@@ -1527,7 +1527,8 @@ SignalSender::sendSignal(Uint16 nodeId, 
     signalLogger.flushSignalLog();
   }
 #endif
-  
+  assert(getNodeInfo(nodeId).m_api_reg_conf == true ||
+         s->readSignalNumber() == GSN_API_REGREQ);
   return theFacade->theTransporterRegistry->prepareSend(&s->header,
 							1, // JBB
 							&s->theData[0],