bzr push into mysql-5.1-telco-7.0 branch (jonas:4335 to 4337)

[Jonas Oreland]

 4337 Jonas Oreland	2011-04-26 [merge]
      ndb - merge 63 to 70

 4336 Jonas Oreland	2011-04-26
      ndb - bump version to 7.0.25

    modified:
      configure.in
      storage/ndb/ndb_configure.m4
 4335 Magnus Blåudd	2011-04-26 {clone-mysql-5.1.56-ndb-7.0.24-src-build} [merge]
      Merge

    added:
      mysql-test/suite/rpl_ndb/combinations
      mysql-test/suite/rpl_ndb/t/check_conversions.inc
    renamed:
      mysql-test/extra/rpl_tests/rpl_ndb_2multi_basic.test => mysql-test/suite/rpl_ndb/t/rpl_ndb_2multi_basic.inc
      mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test => mysql-test/suite/rpl_ndb/t/rpl_ndb_2multi_eng.inc
    modified:
      mysql-test/suite/rpl_ndb/r/rpl_ndb_2other.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_typeconv_all.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_typeconv_lossy.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_typeconv_nonlossy.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_typeconv_strict.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2innodb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2myisam.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2ndb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_2other.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb2ndb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_myisam2ndb.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_all.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_lossy.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_nonlossy.test
      mysql-test/suite/rpl_ndb/t/rpl_ndb_typeconv_strict.test
      sql/sql_partition.cc
=== modified file 'configure.in'
--- a/configure.in	2011-04-08 13:59:44 +0000
+++ b/configure.in	2011-04-26 07:39:21 +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.56-ndb-7.0.24], [], [mysql])
+AC_INIT([MySQL Server], [5.1.56-ndb-7.0.25], [], [mysql])
 
 AC_CONFIG_SRCDIR([sql/mysqld.cc])
 AC_CANONICAL_SYSTEM

=== modified file 'storage/ndb/ndb_configure.m4'
--- a/storage/ndb/ndb_configure.m4	2011-03-30 21:15:29 +0000
+++ b/storage/ndb/ndb_configure.m4	2011-04-26 07:25:51 +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=24
+NDB_VERSION_BUILD=25
 NDB_VERSION_STATUS=""
 
 dnl for build ndb docs

No bundle (reason: useless for push emails).