bzr push into mysql-5.1-telco-7.0 branch (magnus.blaudd:3979 to 3982)

[Magnus Blåudd]

 3982 Magnus Blåudd	2010-11-09
      ndb
       - link ndb_mgm with readline libraries on *nix
       - strip src/mgmclient/CMakeLists.txt from uneccessary includes

    modified:
      storage/ndb/src/mgmclient/CMakeLists.txt
 3981 Magnus Blåudd	2010-11-09
      ndb - configure cmake/Makefile

    modified:
      configure.in
 3980 Magnus Blåudd	2010-11-09
      ndb
       - fix typo, missing ending )

    modified:
      storage/ndb/CMakeLists.txt
 3979 Magnus Blåudd	2010-11-09 [merge]
      Merge 7.0-wix -> 7.0

    removed:
      storage/ndb/cmake/cmake_parse_arguments.cmake
      storage/ndb/cmake/libutils.cmake
    added:
      cmake/
      cmake/Makefile.am
      cmake/abi_check.cmake
      cmake/bison.cmake
      cmake/build_configurations/
      cmake/build_configurations/mysql_release.cmake
      cmake/cat.cmake
      cmake/character_sets.cmake
      cmake/check_minimal_version.cmake
      cmake/cmake_parse_arguments.cmake
      cmake/configurable_file_content.in
      cmake/configure.pl
      cmake/cpack_source_ignore_files.cmake
      cmake/create_initial_db.cmake.in
      cmake/do_abi_check.cmake
      cmake/dtrace.cmake
      cmake/dtrace_prelink.cmake
      cmake/install_layout.cmake
      cmake/install_macros.cmake
      cmake/libutils.cmake
      cmake/make_dist.cmake.in
      cmake/merge_archives_unix.cmake.in
      cmake/mysql_add_executable.cmake
      cmake/mysql_version.cmake
      cmake/os/
      cmake/os/AIX.cmake
      cmake/os/Cygwin.cmake
      cmake/os/Darwin.cmake
      cmake/os/FreeBSD.cmake
      cmake/os/HP-UX.cmake
      cmake/os/Linux.cmake
      cmake/os/OS400.cmake
      cmake/os/SunOS.cmake
      cmake/os/Windows.cmake
      cmake/os/WindowsCache.cmake
      cmake/package_name.cmake
      cmake/plugin.cmake
      cmake/readline.cmake
      cmake/ssl.cmake
      cmake/stack_direction.c
      cmake/tags.cmake
      cmake/versioninfo.rc.in
      cmake/zlib.cmake
    modified:
      Makefile.am
      storage/ndb/CMakeLists.txt
      storage/ndb/src/CMakeLists.txt
=== modified file 'configure.in'
--- a/configure.in	2010-11-03 12:18:22 +0000
+++ b/configure.in	2010-11-09 15:34:24 +0000
@@ -2991,6 +2991,7 @@ AC_CONFIG_FILES(Makefile extra/Makefile 
  mysql-test/Makefile mysql-test/lib/My/SafeProcess/Makefile dnl
  netware/Makefile sql-bench/Makefile dnl
  include/mysql_version.h plugin/Makefile win/Makefile)
+AC_CONFIG_FILES(cmake/Makefile) # MCP_WIX
 
 AC_CONFIG_COMMANDS([default], , test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h)
 

=== modified file 'storage/ndb/CMakeLists.txt'
--- a/storage/ndb/CMakeLists.txt	2010-11-09 14:33:15 +0000
+++ b/storage/ndb/CMakeLists.txt	2010-11-09 15:17:30 +0000
@@ -27,7 +27,7 @@ ELSE()
 
   IF(NOT DEFINED WITH_ZLIB)
     # Hardcode use of the bundled zlib
-    MESSAGE(STATUS "using bundled zlib (hardcoded)"
+    MESSAGE(STATUS "using bundled zlib (hardcoded)")
     SET(ZLIB_LIBRARY zlib)
     SET(ZLIB_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/zlib)
   ENDIF()

=== modified file 'storage/ndb/src/mgmclient/CMakeLists.txt'
--- a/storage/ndb/src/mgmclient/CMakeLists.txt	2010-03-05 19:19:56 +0000
+++ b/storage/ndb/src/mgmclient/CMakeLists.txt	2010-11-09 15:35:52 +0000
@@ -13,14 +13,13 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-INCLUDE(${CMAKE_SOURCE_DIR}/storage/ndb/config/type_ndbapi.cmake)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/ndb/include/mgmapi
-                    ${CMAKE_SOURCE_DIR}/storage/ndb/src/common/mgmcommon)
+INCLUDE_DIRECTORIES(${NDB_SOURCE_DIR}/src/common/mgmcommon
+		    ${READLINE_INCLUDE_DIR})
 
 ADD_LIBRARY(ndbmgmclient STATIC
             CommandInterpreter.cpp)
 
-
+ADD_DEFINITIONS(${READLINE_DEFINES})
 ADD_EXECUTABLE(ndb_mgm
                main.cpp)
 
@@ -34,5 +33,8 @@ TARGET_LINK_LIBRARIES(ndb_mgm
                dbug
                mysys
                strings)
+IF(UNIX)
+  TARGET_LINK_LIBRARIES(ndb_mgm ${READLINE_LIBRARY})
+ENDIF(UNIX)
 
 INSTALL(TARGETS ndb_mgm DESTINATION bin)

No bundle (reason: useless for push emails).