From: John David Duncan
Date: April 27 2011 11:02pm
Subject: bzr commit into mysql-5.1-telco-7.2 branch (john.duncan:4169)
List-Archive: http://lists.mysql.com/commits/136253
Message-Id: <201104272303.p3RN334Y006638@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1491673249=="

--===============1491673249==
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:john.duncan@stripped

 4169 John David Duncan	2011-04-27
      Allow JTie (and ClusterJ) to build on FreeBSD

    modified:
      storage/ndb/ndb_configure.m4
=== modified file 'storage/ndb/ndb_configure.m4'
--- a/storage/ndb/ndb_configure.m4	2011-04-27 04:28:04 +0000
+++ b/storage/ndb/ndb_configure.m4	2011-04-27 23:02:01 +0000
@@ -178,6 +178,7 @@ AC_DEFUN([MYSQL_CHECK_JAVA], [
   dnl try to add extra include path
   case "$host_os" in
   bsdi*)    JNI_SUBDIRS="bsdos";;
+  freebsd*) JNI_SUBDIRS="freebsd";;
   linux*)   JNI_SUBDIRS="linux genunix";;
   osf*)     JNI_SUBDIRS="alpha";;
   solaris*) JNI_SUBDIRS="solaris";;


--===============1491673249==
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: a835dde076eef48794def83d1b3934b36e7b163a
# timestamp: 2011-04-27 16:02:20 -0700
# base_revision_id: john.duncan@stripped\
#   apy2tvm8fnw07m6t
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWes2+lMAAXVfgAAQUHP//38x
HgC////wUANntCdxzcwoGhTFT2hPRTJ7Sm9UabSbU0Nqek9IHqZPSaBKUxTaGk2pp6aCjTaTTJoA
GgANBoU0yTag9QPQgAAAAAAOYBMAJgABMAATAAEkiaGkYEwgxImRoxGQNBoyMtVJ/P6Ob82UqnVT
ADS9/WpakiPc3NdGZmMPcsVMoQkCIveZnPzpmwphHOeKEGys1fEUE8CbEgKQQruY0cQQqniDyMN+
hp/f1mLCm/DOHFI2pDVmD4yZYwQzVTui8ePcvYSCAzTLrEYWKoCYaISgpKZ44hBSNT3aKkK0UM4V
OrjtlEeZRygIc/YP3b7I1LwP5Gor72XKosIzzFVjywok7z3uAcIib4lBcb0pbyX3Y0iVrbA24lxI
edhqDWinc6uNUdBSi6lAITpwwwlTus4GkBraC2SRRJEQKdaJdJTqHl3obTrE85hspOjMwEUzLfa5
IQJH2KqauVdVCWEgwjEuDFlJyUuRBj16lRxfUmguIA1qOCSLpZmT8bKwn034ka0uhfBRhUSOFfAC
eyAnQQos3msE9AxCNZqDAFsPXV0inepN75LKjEd8FkQgyUwZn+J9ZJc6BR38PKISXcOLcVSrsoe4
FrFt6h3IBqC2awtY2fytl7yIRzIQ9HOvjAJeG4CiUhWWjO7bYdwmFQ2vYQ05GiuwBsgJotneAThb
oG9q4OBmkV8zwSHdfRqTz39HQd1eL8CQwae2hcSdOkTBEvNrbtmg8U3lekOsBdLRuxPo40M8s5vn
KziM6JvbsgZPOVUhiZp0Zd8bTV1QOnD8RlGS6iC3M+IMAhJHCLi4HaTFfxDY8aGRZr3qtX/InKI7
OYEQ6hq9QI9MLi+czYUbUk/m4F+6RFkfYKu3uNFjIg8MewRe3gW1iW0B+DmM6mgWuZf08Q4mYWha
4OBJqRSGOeXppGhpl69IjuXiGgP4KymvKw0mhINmKDu2AyQw5Ib2XAnkAx0YlH7NqHMmRkFTcHff
kkYgqpg5PlPVInRFXOVPDDituLMnkPGW4UcZqyXEKwcQH3pUAHeynhWNQdjmNw7DflS61kN5+EzQ
z1iTXrMjy6R3EDTLsv17GibwiFDbjLv+A53xLcSVPZ6rbgc58ddpRLMjYEGWGoOMMsfJ6ROvtWEy
rxC0LZA5ExUjqE2U6yuZi8I6lMYhlGJ/xdyRThQkOs2+lMA=


--===============1491673249==--