bk commit into 5.1 tree (jonas:1.2375)

[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-04 12:12:31+01:00, jonas@stripped +2 -0
  ndb - telco
    update version + add change hist

  cluster_change_hist.txt@stripped, 2007-01-04 12:12:29+01:00, jonas@stripped +5 -0
    add info

  configure.in@stripped, 2007-01-04 12:12:29+01:00, jonas@stripped +2 -2
    bump 

# 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/51-telco

--- 1.405/configure.in	2007-01-04 12:12:35 +01:00
+++ 1.406/configure.in	2007-01-04 12:12:35 +01:00
@@ -7,12 +7,12 @@
 AC_CANONICAL_SYSTEM
 # The Docs Makefile.am parses this line!
 # remember to also change ndb version below and update version.c in ndb
-AM_INIT_AUTOMAKE(mysql, 5.1.14-ndb-6.1.0)
+AM_INIT_AUTOMAKE(mysql, 5.1.14-ndb-6.1.1)
 AM_CONFIG_HEADER(config.h)
 
 NDB_VERSION_MAJOR=6
 NDB_VERSION_MINOR=1
-NDB_VERSION_BUILD=0
+NDB_VERSION_BUILD=1
 NDB_VERSION_STATUS="-beta"
 
 PROTOCOL_VERSION=10

--- 1.2/cluster_change_hist.txt	2007-01-04 12:12:35 +01:00
+++ 1.3/cluster_change_hist.txt	2007-01-04 12:12:35 +01:00
@@ -1,4 +1,9 @@
 
+mysql-5.1.14-ndb-6.1.1
+ 
+  - added extra version info to API to enable support for non-supported online
+    software upgrade
+
 ---------------------------------------------------
 
 mysql-5.1.14-ndb-6.1.0