From: John David Duncan
Date: September 20 2011 8:38pm
Subject: bzr push into mysql-5.5-cluster branch (john.duncan:3511 to 3512)
List-Archive: http://lists.mysql.com/commits/141042
Message-Id: <201109202038.p8KKccHG003231@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3512 John David Duncan	2011-09-20
      Remove ndb.memcache_basic test (superceded by ndb_memcache suite). 
      Fix type in Solaris atomics support.
      Don't try to build libevent with -Werror.

    removed:
      mysql-test/suite/ndb/t/memcache_basic.test
    modified:
      extra/libevent/CMakeLists.txt
      storage/ndb/memcache/atomics.cmake
 3511 John David Duncan	2011-09-20
      More linker fixes

    modified:
      extra/libevent/CMakeLists.txt
      extra/memcached/CMakeLists.txt
=== modified file 'extra/libevent/CMakeLists.txt'
--- a/extra/libevent/CMakeLists.txt	2011-09-20 19:08:56 +0000
+++ b/extra/libevent/CMakeLists.txt	2011-09-20 20:36:52 +0000
@@ -18,6 +18,11 @@ ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
                     ${CMAKE_CURRENT_SOURCE_DIR}/compat/sys)
 
+# libevent cannot currently be built with -Werror
+IF(CMAKE_C_FLAGS)
+  STRING(REPLACE "-Werror" "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
+ENDIF()
+
 SET(LIBEVENT_CORE_SOURCES
                 event.h
                 event-internal.h

=== removed file 'mysql-test/suite/ndb/t/memcache_basic.test'
--- a/mysql-test/suite/ndb/t/memcache_basic.test	2011-09-12 19:54:22 +0000
+++ b/mysql-test/suite/ndb/t/memcache_basic.test	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-
-# Test the fundamental ability to connect to a memcached server,
-# wait for it to become ready, set a value, and then retreive that 
-# value using mysql
-
---source suite/ndb_memcache/include/have_memcache.inc
-
---perl
-
-use strict;
-use lib "lib/";
-use My::Memcache;
-
-my $mc = My::Memcache->new();
-my $port = $ENV{MTR_BUILD_THREAD} * 10 + 10000 + 8;
-
-my $r = $mc->connect("localhost",$port);
-
-if($r == 0) {
-  print STDERR "DID NOT CONNECT TO MEMCACHE AT PORT $port \n";
-}
-else {
-  $mc->set("test_key_1", 1511);
-}
-
-EOF
-
-SELECT string_value from ndbmemcache.demo_table where mkey='test_key_1';

=== modified file 'storage/ndb/memcache/atomics.cmake'
--- a/storage/ndb/memcache/atomics.cmake	2011-09-17 23:23:26 +0000
+++ b/storage/ndb/memcache/atomics.cmake	2011-09-20 20:36:52 +0000
@@ -43,7 +43,7 @@ IF(HAVE_GCC_ATOMIC_BUILTINS)
   MESSAGE(STATUS "Using gcc atomic builtins") 
 ELSEIF(HAVE_DARWIN_ATOMICS) 
   MESSAGE(STATUS "Using Darwin OSAtomic") 
-ELSEIF(HAVE_SOALRIS_ATOMICS)
+ELSEIF(HAVE_SOLARIS_ATOMICS)
   MESSAGE(STATUS "Using Solaris <atomic.h>")
 ELSE()
   MESSAGE(FATAL_ERROR "No atomic functions available")

No bundle (reason: useless for push emails).