bzr push into mysql-5.1-telco-7.1 branch (jonas:2879 to 2880)

[Jonas Oreland]

 2880 Jonas Oreland	2009-05-04
      ndb - create 5.1-7.1 tree

    M  .bzr-mysql/default.conf
    M  configure.in
 2879 Ole John Aske	2009-04-30 [merge]
      Fix bug#44570

    M  include/my_global.h
      2585.89.4 Ole John Aske	2009-04-30 [merge]
                Fix for bug#44567, typo in ndbrequire() predicates. -> telco 6.3

        M  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
          2572.56.8 Ole John Aske	2009-04-30
                    Fix for bug#44567, typo in ndbrequire() predicates. -> telco 6.2

            M  storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
      2585.89.3 jack andrews	2009-04-29
                bug#28905  problems with output from `ndbd --help`

        M  storage/ndb/src/kernel/vm/Configuration.cpp
      2585.89.2 jack andrews	2009-04-29 [merge]
                merge

        M  storage/ndb/include/ndb_global.h.in
        M  storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp
        M  storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
        M  storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
        M  storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
        M  storage/ndb/src/ndbapi/ndberror_check.cpp
        M  storage/ndb/test/ndbapi/testSystemRestart.cpp
        M  storage/ndb/test/ndbapi/testUpgrade.cpp
      2585.89.1 jack andrews	2009-04-15
                bug#39080  Compile errors in Cluster: LockQueue.hpp + PosixAsyncFile.cpp + more

        M  storage/ndb/src/kernel/blocks/ndbfs/PosixAsyncFile.cpp
=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2009-03-11 15:20:35 +0000
+++ b/.bzr-mysql/default.conf	2009-05-04 08:48:45 +0000
@@ -1,4 +1,4 @@
 [MYSQL]
 post_commit_to = commits@stripped
 post_push_to = commits@stripped
-tree_name = mysql-5.1-telco-7.0
+tree_name = mysql-5.1-telco-7.1

=== modified file 'configure.in'
--- a/configure.in	2009-04-14 12:51:49 +0000
+++ b/configure.in	2009-05-04 08:48:45 +0000
@@ -10,12 +10,12 @@ AC_CANONICAL_SYSTEM
 #
 # When changing major version number please also check switch statement
 # in mysqlbinlog::check_master_version().
-AM_INIT_AUTOMAKE(mysql, 5.1.32-ndb-7.0.6)
+AM_INIT_AUTOMAKE(mysql, 5.1.32-ndb-7.1.0)
 AM_CONFIG_HEADER([include/config.h:config.h.in])
 
 NDB_VERSION_MAJOR=7
-NDB_VERSION_MINOR=0
-NDB_VERSION_BUILD=6
+NDB_VERSION_MINOR=1
+NDB_VERSION_BUILD=0
 NDB_VERSION_STATUS=""
 
 PROTOCOL_VERSION=10


Attachment: [text/bzr-bundle] bzr/[e-mail]