From: magnus.blaudd
Date: November 20 2012 7:44pm
Subject: bzr push into mysql-5.5-cluster-7.2 branch (magnus.blaudd:4100 to 4101)
List-Archive: http://lists.mysql.com/commits/145345
Message-Id: <20121120194428.24199.29083.4101@wholphin>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4101 magnus.blaudd@stripped	2012-11-20 [merge]
      Merge

    modified:
      storage/ndb/compile-cluster
      storage/ndb/src/ndbapi/ndberror.c
 4100 Bernd Ocklin	2012-11-20
      fix clusterj version numbers

    modified:
      storage/ndb/clusterj/clusterj-jpatest/CMakeLists.txt
      storage/ndb/clusterj/clusterj-openjpa/CMakeLists.txt
      storage/ndb/clusterj/clusterj-test/CMakeLists.txt
=== modified file 'storage/ndb/compile-cluster'
--- a/storage/ndb/compile-cluster	2012-11-13 14:59:15 +0000
+++ b/storage/ndb/compile-cluster	2012-11-20 19:29:20 +0000
@@ -116,6 +116,7 @@ my $cmake_version_id;
   my @args;
   if ($opt_debug)
   {
+    print("compile-cluster: debug build requested\n");
     push(@args, "-DWITH_DEBUG=1");
     push(@args, "-DMYSQL_MAINTAINER_MODE=0");
   }
@@ -143,6 +144,7 @@ my $cmake_version_id;
   {
     print("compile-cluster: autotest build requested, extra everything\n");
     push(@args, "-DWITH_NDB_CCFLAGS='-DERROR_INSERT'");
+    push(@args, "-DWITH_EMBEDDED_SERVER=1");
   }
 
   # The cmake generator to use

=== modified file 'storage/ndb/src/ndbapi/ndberror.c'
--- a/storage/ndb/src/ndbapi/ndberror.c	2012-11-06 10:38:28 +0000
+++ b/storage/ndb/src/ndbapi/ndberror.c	2012-11-20 19:29:20 +0000
@@ -617,7 +617,7 @@ ErrorBundle ErrorCodes[] = {
   { 1426, DMEC, SE, "No such subscriber" },
   { 1427, DMEC, NR, "Api node died, when SUB_START_REQ reached node "},
   { 1428, DMEC, IE, "No replica to scan on this node (internal index stats error)" },
-  { 1429, DMEC, IE, "Subscriber node undefined in SubStartReq (config change\?\?)" },
+  { 1429, DMEC, IE, "Subscriber node undefined in SubStartReq (config change?)" },
 
   { 4004, DMEC, AE, "Attribute name or id not found in the table" },
   

No bundle (reason: useless for push emails).