From: kevin.lewis
Date: July 12 2010 6:52pm
Subject: bzr commit into mysql-next-mr branch (kevin.lewis:3162) WL#4034
List-Archive: http://lists.mysql.com/commits/113392
Message-Id: <20100712185253.2B7063CDAA5@kevin-lewis-macbook.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1832231161=="

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

 3162 kevin.lewis@stripped	2010-07-12
      WL#4034 - More fixes to storage/infoschema/Makefile.am

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


--===============1832231161==
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: c0b8deb45177d6ac5179720d24cc532c7720c7ed
# timestamp: 2010-07-12 13:52:52 -0500
# source_branch: file:///Users/kevinlewis/Work/Mysql/Clean/mysql-next-\
#   mr/
# base_revision_id: kevin.lewis@stripped\
#   qe26szetkqz1vp34
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTJhb/YAAYRfgAAwWGP/91IG
AIS////wUANam82jdrdHVg0KCekxNNqNPSDJ6INDQDRoBJU1R+CYmqfpJkyaZNGgaMgAAkkAp5Jl
NqZlPIiM1D1NNGmmmgDAAAAADQaANANAJJU2miaeQ1U/aRiaRD1DR6agMmNGC47jHscN59/W0t/W
sN9kEXOm7hCE5yw55MzLz+h+YTcBqDhmhmiMwWg+I6fbY7jLMY9ZF+cck/WwkMha3ccbJVBPLhaa
aJvXTvDPLHZokFUjC975ufBLe25yFSiE7WGS0oTQnrtZUovQ0ZSe9WIsTG7eU0Lx4FOe5lMohrp3
Y2bRRLLen/E+sILEN2LBZtEcxOJUaqfYOBVvKmFhFC5veItyucdwrUxlkFd8XV0OCKbS6jHcwdR4
RxyBo0HGDnlNwr3G0U6obLumlSsuLFBZPtuIl4z2ZF5eeywRzTPo4ay4CccIQqGuYQINE+OUcr5K
WvklSivJUIODoVrBkEYMp4BYcWIN1Krtsl3YmqqSry1rnIUal6jF0YNc3VyMxbzK0TcOu1qTuxjT
eNtxfnZoilR5Ecmm0SISm3Q51o2Pgxl9vmkRoyY9HespcuLBnsZtt2xD+kCk4BoNeUhLEpDvrPp3
pGhHWECm1g/24bw5r4NF68RCoCAqk1UkktbRcAgY/CHi0tIPhTMKnROSxoevmy7BYOZImkX7eeE9
xTYokVsHwUdYZkPLlqwWGSBj2jLwJwSB2wFwEVWvKoNSGACtbaUgmkM+YDJIpTlXsICmeqZWywxy
7YmcB4SSLApSJWJ95I8Vy57dIDhYHmL85g2bh4qsJMFdQW06TOHGwUAjiTNsfBM7QtS2HYV2qRmE
OvX1D234PmG5IsDW13LouBmFgWlw2wxDAPvmF0AhQFouKIpDHiapF2EttC6CHripigLCfJVleNpe
wqHOLGc5khlxi8Hxck1UOZMrcPJW6wUQ5vP8kSR96Lo9OFC/UL5MyoHVb3SDP4hOua6KwAyalG3S
JV3PUnYQgDZJDEb4CfUK4MbKA1F4e1C6aPkFfj4uc4vMGSgbH10yJg6KJA25VrgtDmqCS4BvExIy
RYF6z9ocFZxIH/4u5IpwoSBkwt/s


--===============1832231161==--