From: John David Duncan
Date: April 27 2011 4:28am
Subject: bzr commit into mysql-5.1-telco-7.2 branch (john.duncan:4168)
List-Archive: http://lists.mysql.com/commits/136135
Message-Id: <201104270428.p3R4SmjK007427@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0309836216=="

--===============0309836216==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///Users/jdd/bzr-repo/working/cluster-7.2-labs-memcached/ based on revid:bernhard.ocklin@stripped

 4168 John David Duncan	2011-04-26
      linking with -ldl: not on all platforms

    modified:
      storage/ndb/memcache/unit/Makefile.am
      storage/ndb/ndb_configure.m4
=== modified file 'storage/ndb/memcache/unit/Makefile.am'
--- a/storage/ndb/memcache/unit/Makefile.am	2011-04-19 01:23:01 +0000
+++ b/storage/ndb/memcache/unit/Makefile.am	2011-04-27 04:28:04 +0000
@@ -81,7 +81,7 @@ run_unit_tests_LDFLAGS = \
                 -L$(top_srcdir)/storage/ndb/src/.libs \
                 -L$(top_srcdir)/mysys/.libs \
                 -L$(top_srcdir)/strings/.libs \
-		            -lndbclient -lmysys -lmystrings -ldl 
+		            -lndbclient -lmysys -lmystrings 
  
 
 # --------------- test_workqueue --------------------------

=== modified file 'storage/ndb/ndb_configure.m4'
--- a/storage/ndb/ndb_configure.m4	2011-04-09 07:36:24 +0000
+++ b/storage/ndb/ndb_configure.m4	2011-04-27 04:28:04 +0000
@@ -51,8 +51,6 @@ AC_SUBST(DOXYGEN)
 AC_SUBST(PDFLATEX)
 AC_SUBST(MAKEINDEX)
 
-AC_CHECK_HEADERS_ONCE([mach/mach_time.h])
-
 dnl ---------------------------------------------------------------------------
 dnl Check if ndbmtd should/can be built
 dnl - skipped if with --without-ndbmtd specified
@@ -680,6 +678,13 @@ if test "x$ac_cv_mac_atomics" = xyes; th
             [Darwin libkern OSAtomic functions.])
 fi
 
+dnl -- For timingpoint on Mac
+AC_CHECK_HEADERS_ONCE([mach/mach_time.h])
+
+dnl -- For loading modules on Linux
+AC_SEARCH_LIBS(dlsym, dl)
+
+
 ])
 
 AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [


--===============0309836216==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/john.duncan@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: john.duncan@stripped
# target_branch: file:///Users/jdd/bzr-repo/working/cluster-7.2-labs-\
#   memcached/
# testament_sha1: 26d26ed779919d2dff2d7fa7f86824de864210ba
# timestamp: 2011-04-26 21:28:36 -0700
# base_revision_id: bernhard.ocklin@stripped\
#   w16py211z53bzjn1
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbeG1a8AAivfgEBwUGf/939/
mAq////wUATZOwAMbzS25s5BJQgj0JoZFPyaaJ6U8UeUD0jT1B5MibUaHNMTJk0YTBMTTAJgEMEY
EYBJETCEwICbUKbao0A00aGQAeo9QJJIKPU8p6eqeUaaek9pCAADQ00AA9QSUQNNTVP9Ue0UzVP0
1HiNU9qh6QAZAABCLRbcxTHTpNj9fTX+yj87l7vTpCV+CwZB3edxHr1lKdkH0oxrd+5+lmnM0Nwz
MMy/n9gsjW/LIjq2baVeTUo9GPP3oGrRyOtkXp1pNuXIQwFTEmxYyl7fOnrRIQx70OYg4ctM/jrm
rITylJIUlbAUTqJA4sjtMT1uq1eyzEqqp7nwQ9MgZIYqJlSRzyFGwUSgmBnjjInMwg+uDjKGQD4j
AsQHQ1uqpP0AxzsZFVVi8Isng/j2UD1WAHeV7sdpgDlLJaLcSGxhnf/Qe5edaGeqzH9s+suRK1hh
zQcugdTg0CS5UUn338TjxHAKHVSfxKTMUynctOnrnECTAOavai0fwuHXroYAZu0X2W1vzaara+hZ
MscrFTLV4N20YoBWL3h4uSsHvsHSDW6hvs4d9VQxwowTKrcsYG4+Iey1ebULlP/TuMeH/Lf2MZOu
eq66ma6ZPsWGSvs4lTVVbvL8JlCvNjy4yKmegUrRTpBvs6Lr5RPADthhXe2kANfLbaZkrxuHEuhD
WUTQ6NDlyCvLKZlYXgTXO3uVALi4Yus3zY3PuMHJTLayGHLSJuuvnu4gdrIW4o2M9JEJZGizw2J4
jZEFKOdKp20VLZtVphLWCdwaTRVESm3sWXqxKjbGQ7Lp95ysEqn1E3GDGDObvP+9nclOc+v2kb0h
L8R/NjXQGPs6SW52Dp4P9J8TteWixjGC3HF8AMRnYWmnZ3bTeRHtOFsxF21m/4+CRR0pcLgr1479
neqyvjgBPeBhpWFKUxMw7tdGfg9WmZQB2WxlgS6FnTusPhlPMmzzxZasYLQ2tcybaTkjgexiJN7d
Mx123FU26WEeotfEKAeNplR4ZETuKmx5GKbplzgVXFyRMAX9TTWzFnfC0K7x5ZnvYNqNgtIbW4KO
LWW5xn4VuCaJmjyaYs069UwLykpbdgVWS+8vojQ3BROg3GpfWcgZxOanVhBbvyUK84m4zAnkNbfk
2U46rVKTzMheU6GrDIVBQtkuALOKLHmVRTO/yIZdHUqxDQywLYiaJuqWGfdafnRkkyoxoo5zQEvq
d3yqxOVB6nmmHYLlTlgWTSK1EsitKVEPxwCtETqkyjgOlZkh6QwHt7FGBfNQsYVQendbDFCyXjAx
Ak/3U271y4Wme+C8bdZWJqZk4eyYcE6Q/gva5YkST2kwUYo78bXJkUXLCmkeRdnBhMwMLYCjXT4q
NeFX1pFtiS11Qi6KYvL0jMJ4TOWbDgyLkpgwwSrOfnueqPZVvfYOyWQFoOlKCqZmAmID1SKXpals
8UFyKeFfRUEqvlmj5zyk9AOhHbNHZdJWGkDsQwnDS3Z7mXytPQ+b53KDGaYWl1rMrljc0+BC41Bk
sGxOWTQEt57JLqpyOV4plWmtjYD7gGmaHWm2OXFyRY5WxTgiYItAuumA3q3EedcpW9DrWMNqQ/gu
BX6GcDpd61Z4L0duCyrrP+LuSKcKEhbw2rXg


--===============0309836216==--