From: John David Duncan
Date: October 12 2011 3:46am
Subject: bzr push into mysql-5.5-cluster branch (john.duncan:3596 to 3597)
List-Archive: http://lists.mysql.com/commits/141391
Message-Id: <201110120346.p9C3kdvn017534@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3597 John David Duncan	2011-10-11
      Install ndb_memcache_metadata.sql in mysql/share/memcache_api.
      Let mysql-test-run.pl look for it there.
      Fold in other changes to memcache/CMakeLists.txt from build team.

    modified:
      mysql-test/mysql-test-run.pl
      storage/ndb/memcache/CMakeLists.txt
 3596 John David Duncan	2011-10-11
      Use %llu to print a Uint64 (it's correct on both gcc and Sun)

    modified:
      storage/ndb/memcache/src/ClusterConnectionPool.cc
      storage/ndb/memcache/src/DataTypeHandler.cc
      storage/ndb/memcache/src/schedulers/S_sched.cc
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-09-25 07:19:37 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-10-12 03:44:41 +0000
@@ -3096,8 +3096,9 @@ sub memcached_load_metadata($) {
   my $cluster = shift;
     
   my $sql_script= my_find_file($basedir,
-                             ["share", "storage/ndb/memcache/scripts"],
-                             "ndb_memcache_metadata.sql", NOT_REQUIRED);
+                             ["share/memcache_api", 
+                              "storage/ndb/memcache/scripts"],
+                              "ndb_memcache_metadata.sql", NOT_REQUIRED);
 
   foreach my $mysqld (mysqlds()) {
     if(-d $mysqld->value('datadir') . "/" . "ndbmemcache") {

=== modified file 'storage/ndb/memcache/CMakeLists.txt'
--- a/storage/ndb/memcache/CMakeLists.txt	2011-10-02 23:08:15 +0000
+++ b/storage/ndb/memcache/CMakeLists.txt	2011-10-12 03:44:41 +0000
@@ -39,6 +39,7 @@ endif()
 remove_definitions(-DNDEBUG)
 
 include("FindMemcached.cmake")
+include(CheckLibraryExists)
 
 IF(MEMCACHED_FOUND) 
   MESSAGE(STATUS "Building NDB Memcache using " ${MEMCACHED_ROOT_DIR})
@@ -118,6 +119,9 @@ IF(${CMAKE_COMPILER_IS_GNUCXX})
   STRING(REPLACE "-fno-implicit-templates" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
 ENDIF()
 
+IF(${CMAKE_CXX_COMPILER_ID} STREQUAL "SunPro")
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -features=extensions") # __func__
+ENDIF()
 
 ########## ENVIRONMENT TESTS #########
 
@@ -130,6 +134,11 @@ CHECK_FUNCTION_EXISTS(gethrtime  HAVE_GE
 CHECK_FUNCTION_EXISTS(gethrvtime HAVE_GETHRVTIME)
 CHECK_FUNCTION_EXISTS(memset     HAVE_MEMSET)
 # Also: log in libm, dlsym in libdl? 
+CHECK_LIBRARY_EXISTS(dl dlsym "" HAVE_LIBDL)
+SET(LIBDL "")
+if(${HAVE_LIBDL}) 
+    set(LIBDL "dl")
+endif()
 
 CHECK_CXX_SOURCE_RUNS("
     main()  {
@@ -193,16 +202,12 @@ set_target_properties(ndb_engine PROPERT
 # Install the ndb_engine.so module
 install(TARGETS ndb_engine DESTINATION ${INSTALL_LIBDIR})
 
-# Install the metadata.sql script
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/scripts/ndb_memcache_metadata.sql 
-        DESTINATION ${INSTALL_MYSQLSHAREDIR})
-
 ### Install the memcache-api directory  ################
-install(DIRECTORY DESTINATION memcache-api)
-install(PROGRAMS sandbox.sh DESTINATION memcache-api)
-install(FILES README DESTINATION memcache-api)
+install(DIRECTORY DESTINATION "${INSTALL_MYSQLSHAREDIR}/memcache-api")
+install(PROGRAMS sandbox.sh DESTINATION "${INSTALL_MYSQLSHAREDIR}/memcache-api")
+install(FILES README DESTINATION "${INSTALL_MYSQLSHAREDIR}/memcache-api")
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/scripts/ndb_memcache_metadata.sql 
-        DESTINATION memcache-api)
+        DESTINATION "${INSTALL_MYSQLSHAREDIR}/memcache-api")
         
 # memcached_path.pl is also installed, for use by installed mtr
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/memcached_path.pl

No bundle (reason: useless for push emails).