From: magnus.blaudd
Date: May 24 2011 11:51am
Subject: bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4409)
List-Archive: http://lists.mysql.com/commits/137977
Message-Id: <20110524115145.08A8D13402B@pilot>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6928797449796087043=="

--===============6928797449796087043==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@stripped

 4409 magnus.blaudd@stripped	2011-05-24
      ndb
       - reduce make system magic by including the necessary by relative path
        instead of global include paths when accessing private internals

    modified:
      storage/ndb/src/mgmsrv/Config.hpp
      storage/ndb/tools/CMakeLists.txt
      storage/ndb/tools/Makefile.am
      storage/ndb/tools/ndb_config.cpp
=== modified file 'storage/ndb/src/mgmsrv/Config.hpp'
--- a/storage/ndb/src/mgmsrv/Config.hpp	2011-02-01 23:27:25 +0000
+++ b/storage/ndb/src/mgmsrv/Config.hpp	2011-05-24 11:51:39 +0000
@@ -22,7 +22,7 @@
 #include <kernel/NodeBitmask.hpp>
 #include "ConfigInfo.hpp"
 #include <mgmapi.h>
-#include <mgmapi_configuration.hpp>
+#include "../mgmapi/mgmapi_configuration.hpp"
 
 
 /**

=== modified file 'storage/ndb/tools/CMakeLists.txt'
--- a/storage/ndb/tools/CMakeLists.txt	2011-02-03 14:20:36 +0000
+++ b/storage/ndb/tools/CMakeLists.txt	2011-05-24 11:51:39 +0000
@@ -72,12 +72,6 @@ MYSQL_ADD_EXECUTABLE(ndb_config
   COMPONENT ClusterTools)
 TARGET_LINK_LIBRARIES(ndb_config ndbmgmclient ndbconf)
 
-SET(options "-I${CMAKE_SOURCE_DIR}/storage/ndb/src/mgmapi")
-SET(options "${options} -I${CMAKE_SOURCE_DIR}/storage/ndb/src/mgmsrv")
-SET(options "${options} -I${CMAKE_SOURCE_DIR}/storage/ndb/include/mgmcommon")
-SET_TARGET_PROPERTIES(ndb_config PROPERTIES
-                      COMPILE_FLAGS "${options}")
-
 # Build ndbinfo_sql and run it to create ndbinfo.sql
 ADD_EXECUTABLE(ndbinfo_sql ndbinfo_sql.cpp)
 TARGET_LINK_LIBRARIES(ndbinfo_sql ndbclient)

=== modified file 'storage/ndb/tools/Makefile.am'
--- a/storage/ndb/tools/Makefile.am	2011-02-23 22:48:42 +0000
+++ b/storage/ndb/tools/Makefile.am	2011-05-24 11:51:39 +0000
@@ -60,10 +60,6 @@ ndb_config_SOURCES = ndb_config.cpp \
 	../src/mgmsrv/ConfigInfo.cpp \
 	../src/mgmsrv/InitConfigFileParser.cpp
 
-ndb_config_CXXFLAGS = -I$(top_srcdir)/storage/ndb/src/mgmapi \
-                      -I$(top_srcdir)/storage/ndb/src/mgmsrv \
-                      -I$(top_srcdir)/storage/ndb/include/mgmcommon
-
 ndb_restore_LDADD = $(top_builddir)/storage/ndb/src/common/util/libndbazio.la \
                     $(LDADD)
 

=== modified file 'storage/ndb/tools/ndb_config.cpp'
--- a/storage/ndb/tools/ndb_config.cpp	2011-02-01 23:27:25 +0000
+++ b/storage/ndb/tools/ndb_config.cpp	2011-05-24 11:51:39 +0000
@@ -28,8 +28,8 @@
 
 #include <NdbOut.hpp>
 #include <mgmapi.h>
-#include <mgmapi_configuration.hpp>
-#include <ConfigInfo.hpp>
+#include "../src/mgmapi/mgmapi_configuration.hpp"
+#include "../src/mgmsrv/ConfigInfo.hpp"
 #include <NdbAutoPtr.hpp>
 #include <NdbTCP.h>
 
@@ -552,7 +552,7 @@ noconnect:
   return conf;
 }
 
-#include <Config.hpp>
+#include "../src/mgmsrv/Config.hpp"
 #include <EventLogger.hpp>
 
 extern EventLogger *g_eventLogger;


--===============6928797449796087043==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
 name="bzr/magnus.blaudd@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@stripped\
#   skqeariz1y9yacbi
# target_branch: file:///home/msvensson/mysql/7.0/
# testament_sha1: 3765dc31864458b58777c4776536c74bdf2a704d
# timestamp: 2011-05-24 13:51:44 +0200
# base_revision_id: magnus.blaudd@stripped\
#   2vcqggyxwgbxr7xa
# 
# Begin bundle
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


--===============6928797449796087043==--