From: kevin.lewis
Date: July 13 2010 4:27pm
Subject: bzr commit into mysql-next-mr branch (kevin.lewis:3166) WL#4034
List-Archive: http://lists.mysql.com/commits/113484
Message-Id: <20100713162713.F19D53DBFC6@kevin-lewis-macbook.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1249560040=="

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

#At file:///Users/kevinlewis/Work/Mysql/Merge/mysql-next-mr-wl4034/ based on revid:kevin.lewis@stripped

 3166 kevin.lewis@stripped	2010-07-13
      WL#4034 - Add extra/yassl/include to Makefile.am like it is in CMakeLists.txt

    modified:
      storage/infoschema/Makefile.am
=== modified file 'storage/infoschema/Makefile.am'
--- a/storage/infoschema/Makefile.am	2010-07-12 20:31:48 +0000
+++ b/storage/infoschema/Makefile.am	2010-07-13 16:27:07 +0000
@@ -23,6 +23,7 @@ pkgplugindir =		$(pkglibdir)/plugin
 AM_CPPFLAGS =           -I$(top_srcdir)/include \
 			-I$(top_srcdir)/regex \
 			-I$(top_srcdir)/sql \
+			-I$(top_srcdir)/extra/yassl/include \
                         -I$(srcdir)
 WRAPLIBS=
 


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: kevin.lewis@stripped
# target_branch: file:///Users/kevinlewis/Work/Mysql/Merge/mysql-next-\
#   mr-wl4034/
# testament_sha1: 2ea2afa042e1c4ee2fd6483f3fd16206ed564710
# timestamp: 2010-07-13 11:27:13 -0500
# source_branch: file:///Users/kevinlewis/Work/Mysql/Clean/mysql-next-\
#   mr/
# base_revision_id: kevin.lewis@stripped\
#   icvc6oaq774txzdf
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSZCmKIAAX7fgAAwXGP/93om
AIS////wUANbbatNhp5w8ElEDJKfgmBqaob00psTTUAYmnogygSZkybUm1GpiaaBoHpAAAEkgCNC
myjNSZPU9INlDTIaYgAykRptT1PRHpHqA0aGg0DQyaBoElJNGTCaYgDTQAAAANDMWtr7W++fmZ7q
Dc3PYCPQ9+2DoTrzcsmZjx8F6QnRw0GLZjmThwV5/rKWu9p/KiGXht0q7ukLUDllt3bJMz6fGQBl
jNKFjc1M8/LKjkK5mKSekX2b5yN8stg5wsWWNQsrcEJ7dJygqCYQ9cJuUpq6Eh9vFWFw3yQvlocN
kStkpgVZvW6TgeczKHwG/4jSstBoMqO44CFsZBKWz0L0Lo4soBbXViibUriKeBApWAYyWZpue7WQ
eJReGLKkeF3CygrGqA0fz64ry1WmR2KEIWFsw44EtP6sHO4qpTCi0FhdI1k71Em3sLys2hWA50Jz
hfckmGxQKFGi7HBcQk3l4kLXJecToBlFQKyDKq7ArP0UoXg2ROZEOFdQTWWjPgpJtDIFr2QqDidz
jSxAs0yaujffJr2pjm0hTm8kOTTaJEJTbuO3YOq72Gn44pGMz2DGM8ootfRvnG/m2miVGzWM8OHz
MpA3ZnCGek70iibPdVIEwvRVHTULbZvqrKkch6+lqhDkWkN9/BS7wbnJKSdluLe2GWeDWJEQEEh8
a2fGp1Z3nE6joC6WUqdMmJVvn9dpt1XcZu0fd0+zWgFFloyvTsxeM28iaXZuhS5RrA355abL3qi8
CeuNaqpLFu0chUaRvfllOUpDguSKnrrzmhka4brBjRslJ63h3bKWGrWc6EfLVmISNcn2l5P1DsmR
2GNqURWZpGRAKPD/YbY5Qh5j7FQkMgD03O5HqV4V0maRWCUkGNFsOrxfCNoIKQPIfSGG5IihsROu
DYbBGtTJ+OSdOidppkc74QLmiQZIZZRedwmDOM3jYIcyZb9/vXuWWQKQdr5N/UhwUXFydbNtmbMn
j5boaLNsJ7F81YuSW6lEV6cCvroquxhAMERYE1z4QqttHg0ia7PDlGuI1wVZ7uP+e5xexfkeyWWt
xHjULlcM6Tlf2bSxYjORMZSWAgtQBEgIKyoHSEZV8i+C2yCwsCv4u5IpwoSBMhTFEA==


--===============1249560040==--