From: John David Duncan
Date: April 28 2011 11:14pm
Subject: bzr commit into mysql-5.1-telco-7.1 branch (john.duncan:4177)
List-Archive: http://lists.mysql.com/commits/136342
Message-Id: <201104282314.p3SNEj3O018616@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0317381481=="

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

#At file:///Users/jdd/bzr-repo/mysql-5.1-telco-7.1/ based on revid:jonas@stripped

 4177 John David Duncan	2011-04-28
      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-26 07:40:28 +0000
+++ b/storage/ndb/ndb_configure.m4	2011-04-28 23:14:15 +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";;


--===============0317381481==
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/mysql-5.1-telco-7.1/
# testament_sha1: dd7d68a3e0d1a431e5ef073ba7d4b2f53f86078d
# timestamp: 2011-04-28 16:14:40 -0700
# source_branch: file:///Volumes/Rugged/bzr-repo/working/bug54169/
# base_revision_id: jonas@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWvtd0gAAW5fgAAQUHP//38x
HgC////wUAOet3KzcbY71Wt4SiU9TMhU/IyZojUJ4FNqfqTyJjTKaaeUGSIp+Rgk9DVHqZqaAAAA
DQBkKbIqM0xJo9TJhAaAA0AAG1SNTNFPT1A0wjUekwE0AD1BiAShKbI0k8aRmqT2k2lPQI08kZAG
TC+eC/n17jF8klzNEDPGgdNzc68oS40qqn68U8tD8mRhmY/NVWj/VzcrLnUL8sQfVFpunVdiPxME
kLO/yicdBCHSqIPqKZahYfe9+m/Q4Yb8gN0mJKZCi31Wyc9hCkVUrUGGdSCtSi0JrxCQIQO9KATL
l/UIu0XQOmuNEHzpELzDZQIM6AOsWVMeQ61JCYn+rrEq0XRVJ8JFeBcab6mNwkDuMtYwg4jMSSTX
W9mWCoFy0hffflBl71iu6mYHBkZihmYtGFsU7ipqaDzlQoKmjWqgSntgczQNRA22XbQUqKqCBYuZ
cVQEnTp/5jhe0tqBcsIx6MEBVoznArsnA5jgEREX4rGVmCxO+QoqYe2iAXXFkg7M0dBBWoqQHPW3
aGKhaxyxK5JbZY2B4SeYZAdwGyJjbakVVVo4tIUSkxR0kIAh0wp3lFuiX410tUdw0/QRImeOZRVX
+M955r2DV4892Ik8ufR/y2XHryQnE2lXBpcMD7714iONxKaYzZ2kN9qI+iahqDUwy5dScagI+Usy
Dg1J4aOBOpMv6TxLbZiFeFI4k6jgXLDi0v4Yji5gGOsrDrcsQBIdylzRCaxr8CRLk1aBSmGekasa
3dkTMimVjaWAaw26Q/HjJWsAcSXx4Z8UpXqrs9BhI9DMbaUniJTTc2Cl+RWwe+5V5MMrzqiowkzM
L9F0CMMaMnLu/ZnHFPOvXQNYO9GdsXWYSTIZyoPcj1gTpbWd0JKVpul2ovV+gt3KmIh8Bk4fgvrb
YFoZt2+xjh+zeLGtQ4Cb9xqysE2BsG3pahuC8L2SrTNCmBijo/LHSTEDl+6UJ6O4grJqHqIG9qIm
JHg8VfUIO4vFRFGRF4KFwDigMehSgdLBBmDBX6K8m9DbrAakYHJQpWNiWMJBSmiAfX2VZxiWc6qj
D5Qqm+0osIoKMUE9YkQTjo0+0iCGnO47SXPh9knhZjzeZ2HugipQDrKyLL3KTXgsaYV+Hiv5QkMk
iFa4lvL5Gtzt5qmNU4kuROmedhF8EKwoVJqYwlVNzQjPR5rRIYKUsM6tcp1eKMLGKpEsZbatIr8c
QJaYQH+LuSKcKEg19rukAA==


--===============0317381481==--