From: Martin Skold
Date: August 21 2012 7:30am
Subject: bzr push into mysql-5.1-telco-7.0 branch (Martin.Skold:4958 to 4959)
List-Archive: http://lists.mysql.com/commits/144577
Message-Id: <201208210730.q7L7U1Le010235@localhost6.localdomain6>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4959 Martin Skold	2012-08-21
      ndb - bump version to 7.0.36

    modified:
      configure.in
      storage/ndb/ndb_configure.m4
 4958 Frazer Clement	2012-08-13 {clone-mysql-5.1.63-ndb-7.0.35-src-build} [merge]
      Merge 6.3->7.0

    modified:
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
=== modified file 'configure.in'
--- a/configure.in	2012-07-05 10:52:36 +0000
+++ b/configure.in	2012-08-21 07:29:17 +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.63-ndb-7.0.35], [], [mysql])
+AC_INIT([MySQL Server], [5.1.63-ndb-7.0.36], [], [mysql])
 
 AC_CONFIG_SRCDIR([sql/mysqld.cc])
 AC_CANONICAL_SYSTEM

=== modified file 'storage/ndb/ndb_configure.m4'
--- a/storage/ndb/ndb_configure.m4	2012-07-05 10:52:36 +0000
+++ b/storage/ndb/ndb_configure.m4	2012-08-21 07:29:17 +0000
@@ -2,7 +2,7 @@
 # Should be updated when creating a new NDB version
 NDB_VERSION_MAJOR=7
 NDB_VERSION_MINOR=0
-NDB_VERSION_BUILD=35
+NDB_VERSION_BUILD=36
 NDB_VERSION_STATUS=""
 
 dnl for build ndb docs

No bundle (reason: useless for push emails).