From: John David Duncan
Date: April 27 2011 11:12pm
Subject: [Resend] bzr commit into mysql-5.1-telco-7.1 branch (john.duncan:4176)
List-Archive: http://lists.mysql.com/commits/136255
Message-Id: <201104272312.p3RNCBl7012422@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1443977540=="

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

[This commit e-mail is a repeat.]

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

 4176 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-26 07:40:28 +0000
+++ b/storage/ndb/ndb_configure.m4	2011-04-27 23:09:50 +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";;


--===============1443977540==
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: 6ecdd612cc52c45c431947542dd76a17bfcf6681
# timestamp: 2011-04-27 16:12:06 -0700
# source_branch: file:///Volumes/Rugged/bzr-repo/working/bug54169/
# base_revision_id: jonas@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYQzHxAAAWrfgAAQUHP//38x
HgC////wUAOdeeiM11g6UEok0TymU9NJ4p4hkTNQaDagGJoA5gEwAmAAEwABMAASkmCamj01NpHq
aTTEAA0AAAGiBQ0Gm1H6pkAaAADQAAEkpqaYaaTEwTJNMmmhqeoANNBptR8aHzqj6joiiprgAF5G
oywxUZ7IH66BmY6TF5Y6iolBTIfJVWb8pk+KbHZF5MQfPFR6y2LemOBgkZVd4RPOIhXxooF5mGWw
9NdGdtYXP3tSGaUEmyL3UaMdT9KGaEICdv8SMZCb86XGIT+goqyQQxK4oBuEgolpU5CStmNBiufa
06XCGYpqaIVLxi0vfuIpgW/EJykpNN3HcPxNlmBXTdCIu6Et5EIoLRPwbRNEGthSBZFKGp47ZQVh
qDwRLmJjRjLQxeXOFLPM7uVoTKmhRlEsrhFWGUg0mnWTymdeYTRXERCMlN52Emx4tNHqNC56TsYL
KmhXVQgXa5SFwuyJZKZaMuC9hhC9ZASYRuLXhHGmE3wBRBT9WtxPQNxPsvaMZS1tubhrrtoj6hLr
YkYqlORN0EyrrauCnEkKhj1opymjwe5XVRtJrM0e++lqjt2r7CJEpxSKKq/LPeWS5g1cOHVAY/Hh
xfybHDsmqlE1E+DS3MQBsBlyuNhGa8R/RGFSJrfLAh7q6vnUBH563okDgt2UO/mVHOcgaDHT5FsR
vnOHINDi3RBWE4G0yy7mw5VVEcafNEMl+m4e+Z2konZl54qnPJs4lVpGksBz0NAVwOmQi+AlvAGA
5eJiGERy15NwUPehqL5ITGUrnbWpZMrbKnqq72Ezj9RUYaKGFueuokCNRQWBGU/qzj9xQI3Hd9Yu
rqxWC68RQsMy4KSbiBUsLzaGM9oNbU/km6zazHyZOMPQKvhwNt2i8MxVBudy8TC/zN4z6GCwW/cW
55BkVBSjsCsK4geN2j0mN9/+2yzNIe3cI6JsVPdQVaAjjjGb2DS7nGMkxEk3BgpAcRhdmxGOvtRE
yZFF2NjvxkksEi8FhpY4yolaEE36kyU2BnwSNFKRY7c+FHWjaxah6GHGkwtE8F8tEOthIiG6s5D8
ucFSGOEd30PUmlCkJLrSOpdj8AaRc7e3wbyROZJ4Pa41dPE1gte0nnKoLMqtJtrpsiYnPQsBqkoo
z6KeS0R6eEUenQWrAOIq3iuN4Tl3ITBKsdbMQ4BwO9Gqa8NQbXvLhf8XckU4UJCEMx8Q


--===============1443977540==--