From: John David Duncan
Date: September 22 2011 5:30am
Subject: bzr push into mysql-5.5-cluster branch (john.duncan:3523 to 3524)
List-Archive: http://lists.mysql.com/commits/141071
Message-Id: <201109220530.p8M5UXjw022468@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3524 John David Duncan	2011-09-21
      Move bundled libevent and memcached sources from extra/ to storage/ndb/memcache/extra/ 

    added:
      storage/ndb/memcache/extra/
    renamed:
      extra/libevent/ => storage/ndb/memcache/extra/libevent/
      extra/memcached/ => storage/ndb/memcache/extra/memcached/
    modified:
      extra/CMakeLists.txt
      storage/ndb/memcache/CMakeLists.txt
 3523 John David Duncan	2011-09-21
      LIBDL is overwritten somewhere?

    modified:
      extra/memcached/CMakeLists.txt
=== modified file 'extra/CMakeLists.txt'
--- a/extra/CMakeLists.txt	2011-09-20 16:13:34 +0000
+++ b/extra/CMakeLists.txt	2011-09-22 05:28:51 +0000
@@ -79,16 +79,3 @@ IF(UNIX)
   TARGET_LINK_LIBRARIES(mysql_waitpid mysys)
 ENDIF()
 
-# Support for bundled libevent and memcache
-# WITH_MEMCACHE is declared in storage/ndb/CMakeLists.txt
-option(WITH_LIBEVENT "Use bundled libevent for building memcached" ON)
-
-if(WITH_MEMCACHE) 
-  add_subdirectory(memcached)
-  
-  if(WITH_LIBEVENT) 
-    add_subdirectory(libevent)
-    add_dependencies(memcached event)
-  endif()
-endif()
-

=== modified file 'storage/ndb/memcache/CMakeLists.txt'
--- a/storage/ndb/memcache/CMakeLists.txt	2011-09-22 01:03:13 +0000
+++ b/storage/ndb/memcache/CMakeLists.txt	2011-09-22 05:28:51 +0000
@@ -166,3 +166,19 @@ target_link_libraries(ndbmemcache ndbcli
 set_target_properties(ndbmemcache PROPERTIES LINK_FLAGS "${FINAL_LINK_FLAGS}")
 
 add_subdirectory(unit)
+
+
+######### BUNDLED SOURCES FOR MEMCACHED AND LIBEVENT
+# Support for bundled libevent and memcache
+# WITH_MEMCACHE is declared in storage/ndb/CMakeLists.txt
+option(WITH_LIBEVENT "Use bundled libevent for building memcached" ON)
+
+if(WITH_MEMCACHE)
+  add_subdirectory(memcached)
+
+  if(WITH_LIBEVENT)
+    add_subdirectory(libevent)
+    add_dependencies(memcached event)
+  endif()
+endif()
+

=== added directory 'storage/ndb/memcache/extra'
=== renamed directory 'extra/libevent' => 'storage/ndb/memcache/extra/libevent'
=== renamed directory 'extra/memcached' => 'storage/ndb/memcache/extra/memcached'
No bundle (reason: useless for push emails).