From: magnus.blaudd
Date: July 6 2012 8:40am
Subject: bzr push into mysql-5.5-cluster-7.2 branch (magnus.blaudd:3965 to 3966)
List-Archive: http://lists.mysql.com/commits/144394
Message-Id: <20120706084008.32742.47694.3966@peek02.se.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3966 magnus.blaudd@stripped	2012-07-06 [merge]
      Merge 7.1 -> 7.2

    modified:
      mysql-test/suite/ndb/r/ndb_blob_big.result
      mysql-test/suite/ndb/t/ndb_blob_big.test
      storage/ndb/src/mgmapi/CMakeLists.txt
 3965 magnus.blaudd@stripped	2012-07-06 [merge]
      ndb - bump version to 7.2.8

    modified:
      VERSION
      storage/ndb/VERSION
=== modified file 'mysql-test/suite/ndb/r/ndb_blob_big.result'
--- a/mysql-test/suite/ndb/r/ndb_blob_big.result	2011-09-05 09:32:41 +0000
+++ b/mysql-test/suite/ndb/r/ndb_blob_big.result	2012-07-06 08:38:37 +0000
@@ -1,5 +1,5 @@
 Larger MaxAllowedPacket as this limits the size of Blob MySQLD can handle
-show variables like '%max_allowed_packet%';
+show variables like 'max_allowed_packet';
 Variable_name	Value
 max_allowed_packet	104857600
 use test;

=== modified file 'mysql-test/suite/ndb/t/ndb_blob_big.test'
--- a/mysql-test/suite/ndb/t/ndb_blob_big.test	2011-09-05 09:32:41 +0000
+++ b/mysql-test/suite/ndb/t/ndb_blob_big.test	2012-07-06 08:38:37 +0000
@@ -3,7 +3,7 @@
 # Some tests with larger blobs
 
 --echo Larger MaxAllowedPacket as this limits the size of Blob MySQLD can handle
-show variables like '%max_allowed_packet%';
+show variables like 'max_allowed_packet';
 
 use test;
 

=== modified file 'storage/ndb/src/mgmapi/CMakeLists.txt'
--- a/storage/ndb/src/mgmapi/CMakeLists.txt	2011-07-05 12:46:07 +0000
+++ b/storage/ndb/src/mgmapi/CMakeLists.txt	2012-07-06 08:38:37 +0000
@@ -17,7 +17,6 @@
 INCLUDE(${CMAKE_SOURCE_DIR}/storage/ndb/config/type_util.cmake)
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/ndb/include/mgmapi
                     ${CMAKE_SOURCE_DIR}/storage/ndb/include/kernel
-                    ${CMAKE_SOURCE_DIR}/storage/ndb/mgmsrv
 )
 ADD_DEFINITIONS(-DNDB_MGMAPI)
 ADD_CONVENIENCE_LIBRARY(ndbmgmapi

No bundle (reason: useless for push emails).