From: magnus.blaudd
Date: July 5 2012 1:01pm
Subject: bzr push into mysql-5.1-telco-7.1 branch (magnus.blaudd:4586 to 4587)
List-Archive: http://lists.mysql.com/commits/144382
Message-Id: <20120705130109.22703.32183.4587@peek02.se.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4587 magnus.blaudd@stripped	2012-07-05 [merge]
      Merge 7.0 -> 7.1

    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
 4586 magnus.blaudd@stripped	2012-07-05 [merge]
      ndb - bump version to 7.1.24

    modified:
      configure.in
      storage/ndb/ndb_configure.m4
=== modified file 'mysql-test/suite/ndb/r/ndb_blob_big.result'
--- a/mysql-test/suite/ndb/r/ndb_blob_big.result	2011-01-14 11:51:58 +0000
+++ b/mysql-test/suite/ndb/r/ndb_blob_big.result	2012-07-04 08:39:36 +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-01-14 11:51:58 +0000
+++ b/mysql-test/suite/ndb/t/ndb_blob_big.test	2012-07-04 08:39:36 +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-04 16:30:34 +0000
+++ b/storage/ndb/src/mgmapi/CMakeLists.txt	2012-07-05 12:57:01 +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).