bzr push into mysql-5.5-cluster branch (john.duncan:3522 to 3523)

[John David Duncan]

 3523 John David Duncan	2011-09-21
      LIBDL is overwritten somewhere?

    modified:
      extra/memcached/CMakeLists.txt
 3522 John David Duncan	2011-09-21
      merge

    modified:
      storage/ndb/memcache/include/timing.h
      storage/ndb/memcache/src/atomics.c
      storage/ndb/memcache/unit/all_tests.h
=== modified file 'extra/memcached/CMakeLists.txt'
--- a/extra/memcached/CMakeLists.txt	2011-09-22 01:03:13 +0000
+++ b/extra/memcached/CMakeLists.txt	2011-09-22 05:13:34 +0000
@@ -70,7 +70,10 @@ add_executable(memcached ${MEMCACHED_SOU
 
 target_link_libraries(memcached 
                       event memcached_utilities
-                      ${LIBDL} ${LIBM} ${LIBNSL} ${LIBSOCKET})
+                      ${LIBM} ${LIBNSL} ${LIBSOCKET})
+IF(HAVE_LIBDL)
+target_link_libraries(memcached dl)
+ENDIF()
 
 CHECK_INCLUDE_FILE("link.h"          HAVE_LINK_H)
 CHECK_INCLUDE_FILE("stdbool.h"       HAVE_STDBOOL_H)

No bundle (reason: useless for push emails).