From: John David Duncan Date: September 19 2011 1:21am Subject: bzr push into mysql-5.5-cluster branch (john.duncan:3494 to 3496) List-Archive: http://lists.mysql.com/commits/141024 Message-Id: <201109190121.p8J1LM4K023753@acsmt358.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3496 John David Duncan 2011-09-18 [merge] merge modified: mysql-test/suite/ndb_memcache/t/type_char.test storage/ndb/memcache/CMakeLists.txt storage/ndb/memcache/sandbox.sh.in 3495 John David Duncan 2011-09-17 [merge] Merge: CMake fixes: don't redefine GCC_ATOMIC detection; help linker find ndb libraries. Also remove ndbmemcache_config.h from bzr (it is generated by cmake) removed: storage/ndb/memcache/include/ndbmemcache_config.h modified: storage/ndb/memcache/CMakeLists.txt storage/ndb/memcache/atomics.cmake storage/ndb/memcache/include/ndbmemcache_config.in 3494 jonas oreland 2011-09-16 ndb - don't build testMgmd on windows...it's quite far from being ready... modified: storage/ndb/test/include/NDBT_Workingdir.hpp storage/ndb/test/include/NdbProcess.hpp storage/ndb/test/ndbapi/CMakeLists.txt === modified file 'mysql-test/suite/ndb_memcache/t/type_char.test' --- a/mysql-test/suite/ndb_memcache/t/type_char.test 2011-09-12 14:17:32 +0000 +++ b/mysql-test/suite/ndb_memcache/t/type_char.test 2011-09-19 00:22:10 +0000 @@ -18,7 +18,7 @@ CREATE TABLE test_char_key (mkey char(40 CREATE TABLE test_char_val (mkey varchar(20) PRIMARY KEY, val char(200)) ENGINE=ndbcluster; -INSERT INTO CONTAINERS (name, db_schema, db_table, key_columns, value_columns) +INSERT INTO containers (name, db_schema, db_table, key_columns, value_columns) VALUES("tt_char_key", "ndbmemcache", "test_char_key", "mkey", "val"), ("tt_char_val", "ndbmemcache", "test_char_val", "mkey", "val"); === modified file 'storage/ndb/memcache/CMakeLists.txt' --- a/storage/ndb/memcache/CMakeLists.txt 2011-09-12 10:05:07 +0000 +++ b/storage/ndb/memcache/CMakeLists.txt 2011-09-19 00:22:10 +0000 @@ -36,6 +36,9 @@ include_directories(${NDB_SOURCE_DIR}/sr include_directories(AFTER ${MEMCACHED_INCLUDE_DIR}) include_directories(${NDB_SOURCE_DIR}/src/ndbapi/) +# Paths to libraries +link_directories(${NDB_SOURCE_DIR}/src ${NDB_SOURCE_DIR}/src/common/util) + # Source files for this module set(NDB_MEMCACHE_SOURCE_FILES src/ClusterConnectionPool.cc @@ -120,7 +123,7 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR # Build the module add_library(ndb_engine MODULE ${NDB_MEMCACHE_SOURCE_FILES}) -target_link_libraries(ndb_engine ndbclient) +target_link_libraries(ndb_engine ndbclient ndbgeneral) # Extra linker flags because CMake's "MODULE" support is not quite right. if(APPLE) @@ -147,7 +150,7 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR # Build the library used by the unit tests add_library(ndbmemcache SHARED ${NDB_MEMCACHE_SOURCE_FILES}) -target_link_libraries(ndbmemcache ndbclient ${MEMCACHED_UTILITIES_LIBRARY}) +target_link_libraries(ndbmemcache ndbclient ndbgeneral ${MEMCACHED_UTILITIES_LIBRARY}) set_target_properties(ndbmemcache PROPERTIES LINK_FLAGS "${FINAL_LINK_FLAGS}") add_subdirectory(unit) === modified file 'storage/ndb/memcache/atomics.cmake' --- a/storage/ndb/memcache/atomics.cmake 2011-09-12 10:05:07 +0000 +++ b/storage/ndb/memcache/atomics.cmake 2011-09-17 23:23:26 +0000 @@ -16,25 +16,7 @@ # Identify support for atomic operations IF(NOT MSVC) - CHECK_C_SOURCE_RUNS( - "int main() { - volatile int foo= -10; - volatile int bar= 10; - /* operation returns 0 and foo should be 0 */ - if (!__sync_fetch_and_add(&foo, bar) || foo) - return -1; - bar= __sync_lock_test_and_set(&foo, bar); - /* Now bar is the return value 0 and foo is set to 10 */ - if (bar || foo != 10) - return -1; - __sync_val_compare_and_swap(&bar, foo, 15); - /* CAS should have failed and bar is still 0 */ - if (bar) - return -1; - return 0; - }" - HAVE_GCC_ATOMIC_BUILTINS - ) +# HAVE_GCC_ATOMIC_BUILTINS is already checked by CMake somewhere else CHECK_C_SOURCE_RUNS( "#include === removed file 'storage/ndb/memcache/include/ndbmemcache_config.h' --- a/storage/ndb/memcache/include/ndbmemcache_config.h 2011-09-12 10:05:07 +0000 +++ b/storage/ndb/memcache/include/ndbmemcache_config.h 1970-01-01 00:00:00 +0000 @@ -1,42 +0,0 @@ -/* - Copyright (c) 2011, Oracle and/or its affiliates. All rights - reserved. - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; version 2 of - the License. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA - */ -#ifndef TREE_COMPAT_NDBMEMCACHE_CONFIG_H -#define TREE_COMPAT_NDBMEMCACHE_CONFIG_H - -#include "config.h" -#include "ndb_types.h" - -#define HAVE_MACH_MACH_TIME_H -#define HAVE_SRANDOMDEV -/* #undef HAVE_GETHRTIME */ -/* #undef HAVE_GETHRVTIME */ -#define HAVE_MEMSET - -/* #undef HAVE_SOLARIS_ATOMICS */ -#define HAVE_DARWIN_ATOMICS -/* #undef HAVE_GCC_ATOMIC_BUILTINS */ - -#ifndef HAVE_INTTYPES_H -#define PRIu64 "llu" -#endif - - - -#endif === modified file 'storage/ndb/memcache/include/ndbmemcache_config.in' --- a/storage/ndb/memcache/include/ndbmemcache_config.in 2011-09-12 10:05:07 +0000 +++ b/storage/ndb/memcache/include/ndbmemcache_config.in 2011-09-17 23:23:26 +0000 @@ -31,7 +31,6 @@ #cmakedefine HAVE_SOLARIS_ATOMICS #cmakedefine HAVE_DARWIN_ATOMICS -#cmakedefine HAVE_GCC_ATOMIC_BUILTINS #ifndef HAVE_INTTYPES_H #define PRIu64 "llu" === modified file 'storage/ndb/memcache/sandbox.sh.in' --- a/storage/ndb/memcache/sandbox.sh.in 2011-09-12 10:05:07 +0000 +++ b/storage/ndb/memcache/sandbox.sh.in 2011-09-19 00:22:10 +0000 @@ -121,9 +121,9 @@ memcached_is_running() { } test_pid() { - test -f sandbox/$1 || return -1 + test -f sandbox/$1 || return 1 SERVERPID=`cat $HOME_BASE/sandbox/$1` - ps -p "$SERVERPID" > /dev/null || return -1 + ps -p "$SERVERPID" > /dev/null || return 1 return 0 } No bundle (reason: useless for push emails).