From: Martin Skold
Date: November 2 2012 9:00am
Subject: bzr push into mysql-5.1-telco-7.1 branch (Martin.Skold:4643 to 4644)
List-Archive: http://lists.mysql.com/commits/145171
Message-Id: <20121102090004.3A6939F8259@quadfish>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4644 Martin Skold	2012-11-02 [merge]
      ndb - bump version to 7.1.26

    modified:
      configure.in
      storage/ndb/ndb_configure.m4
 4643 Maitrayi Sabaratnam	2012-11-01 {clone-mysql-5.1.66-ndb-7.1.25-src-build} [merge]
      Merge 7.0->7.1

    modified:
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
=== modified file 'configure.in'
--- a/configure.in	2012-10-22 11:06:43 +0000
+++ b/configure.in	2012-11-02 08:59:31 +0000
@@ -12,7 +12,7 @@ dnl
 dnl When changing the major version number please also check the switch
 dnl statement in mysqlbinlog::check_master_version().  You may also need
 dnl to update version.c in ndb.
-AC_INIT([MySQL Server], [5.1.66-ndb-7.1.25], [], [mysql])
+AC_INIT([MySQL Server], [5.1.66-ndb-7.1.26], [], [mysql])
 
 AC_CONFIG_SRCDIR([sql/mysqld.cc])
 AC_CANONICAL_SYSTEM

=== modified file 'storage/ndb/ndb_configure.m4'
--- a/storage/ndb/ndb_configure.m4	2012-08-22 11:04:43 +0000
+++ b/storage/ndb/ndb_configure.m4	2012-11-02 08:59:31 +0000
@@ -2,7 +2,7 @@
 # Should be updated when creating a new NDB version
 NDB_VERSION_MAJOR=7
 NDB_VERSION_MINOR=1
-NDB_VERSION_BUILD=25
+NDB_VERSION_BUILD=26
 NDB_VERSION_STATUS=""
 
 dnl ---------------------------------------------------------------------------

No bundle (reason: useless for push emails).