From: kevin.lewis
Date: July 12 2010 5:31pm
Subject: bzr commit into mysql-next-mr branch (kevin.lewis:3161) WL#4034
List-Archive: http://lists.mysql.com/commits/113385
Message-Id: <20100712173201.EEDBF3C9D98@kevin-lewis-macbook.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0962387365=="

--===============0962387365==
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

 3161 kevin.lewis@stripped	2010-07-12
      WL#4034 - Fix for storage/infoschema/Makefile.am

    modified:
      storage/infoschema/Makefile.am
=== modified file 'storage/infoschema/Makefile.am'
--- a/storage/infoschema/Makefile.am	2010-06-09 18:42:52 +0000
+++ b/storage/infoschema/Makefile.am	2010-07-12 17:31:57 +0000
@@ -29,7 +29,7 @@ LDADD =
 
 DEFS =                  @DEFS@
 
-noinst_HEADERS =
+noinst_HEADERS = \
 	ha_infoschema.h \
 	infoschema_base.h
 	infoschema_tables_base.h
@@ -55,7 +55,7 @@ noinst_HEADERS =
 
 EXTRA_LIBRARIES =	libinfoschema.a
 noinst_LIBRARIES =	@plugin_infoschema_static_target@
-libinfoschema_a_SOURCES=
+libinfoschema_a_SOURCES= \
 	ha_infoschema.cc \
 	infoschema_base.cc
 	infoschema_tables_base.cc


--===============0962387365==
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: 8500e8c878df14438dcad7c4c4916aca963e58ca
# timestamp: 2010-07-12 12:32:01 -0500
# source_branch: file:///Users/kevinlewis/Work/Mysql/Clean/mysql-next-\
#   mr/
# base_revision_id: kevin.lewis@stripped\
#   27k6jv9qnwon442e
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWxEERMAAYjfgAAQWGP/939G
moS////wUAMngCSgAaaVPQRp6U9NMEjaZT1Gh5QNNqPU0ZPSBzTEwAJgAmAAEwABMOaYmABMAEwA
AmAAJhzTEwAJgAmAAEwABMEkiaaaACaYibVPUniMU8o0aGmnqYnqZ5u4HCJIpdAyNfyoA6qxu6XF
YWF5vjISUw3gcWPP6oGEqWMW2ekbueH7fo5FCRpH3C3JZnRSg86ozTN7wAJsRhpttsm/z63i45uy
2SUki+574u4QSzbJyFRchOp3iXk6927p2QQUX8CiZSgocov+isKmRv2ToXhloU82dbYg+MaP7m45
5LVeh61yjkLipUrPSZBdm/nqXbV1VcavYVHEuI2IXbJTiOVvNUKVgtLKIVLhUUUxiG0lBZOjCtwm
HLHQqZM1M48mON3rdeUNQ9y/PalVrkxu7FbrI53RNkOJz/VdadywpmHJw6hn3B1qn1clqYuUjnyf
PAcFasjlCutV9cLzosBbp9QrezMaxBBlGCqNXCnJoTEHXlhmp9I4YKbgy3V5arlMmsMqISjSUOV4
1HC4a0jC8spIEicm7v+Vd1hPbk/GZoCnk8cCoXi4HAHXjcJLu+fMZthFPrzRBg7AQSV4/H05w4RY
4tbHi1pextzCWsGWJBJewXBQJ+p8bQ13aLahuuRBZ0OuYPvIb9/msmynvqRQvPFX9/ArwXtr3o+H
jnceNPmVnkfwezjW/kqXMkbJF9l18Y0J6ZyokUc36kP0/UA/lrKIf4IXGaqBXSzfWVgfA7deuoNz
LJlMN4FCseNT6iBLB80yswx6bbUkwrkigOCRfJT9nw1OJqVn4yD3eFbLq5Nj1F9KjMIOVASwMsmq
l4poaGCTi7VI0Cv5fL49/404RzDySKg6dPaGnkt1zPyXQLAxMhnHINBeG4Y2ha8OqLEhjySM7WwI
vWojZbqlYY9VEjlYavmmJNCZkhqmR0nmB87ga11aGZMslvovG335gomiY7oFHskckOXc5OV+fUXD
izJ5NtRyhxF2dV2i5Sp2XgngFcEU87SPWKxdfNMHFIhc9TSV9EQaK7/WPNq5I7RXQ+7rXvHNTE98
93OkqFJFITMrrbFy9I+qipJLzFJyRwmT3hUtu4XosJyoUf/F3JFOFCQbEQREwA==


--===============0962387365==--