From: kevin.lewis
Date: July 12 2010 7:49pm
Subject: bzr commit into mysql-next-mr branch (kevin.lewis:3163) WL#4034
List-Archive: http://lists.mysql.com/commits/113396
Message-Id: <20100712195001.982F33D07D5@kevin-lewis-macbook.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0240999935=="

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

 3163 kevin.lewis@stripped	2010-07-12
      WL#4034 - Another try

    modified:
      sql/Makefile.am
=== modified file 'sql/Makefile.am'
--- a/sql/Makefile.am	2010-07-12 17:21:59 +0000
+++ b/sql/Makefile.am	2010-07-12 19:49:51 +0000
@@ -132,8 +132,7 @@ noinst_HEADERS =	item.h item_func.h item
 			contributors.h sql_servers.h sql_signal.h records.h \
 			sql_prepare.h rpl_handler.h replication.h mdl.h \
 			sql_plist.h transaction.h sys_vars.h sql_truncate.h \
-			datadict.h \
-			table_share_builder.h
+			datadict.h table_share_builder.h
 
 mysqld_SOURCES =	sql_lex.cc sql_handler.cc sql_partition.cc \
 			item.cc item_sum.cc item_buff.cc item_func.cc \
@@ -176,8 +175,7 @@ mysqld_SOURCES =	sql_lex.cc sql_handler.
 			sql_builtin.cc sql_tablespace.cc partition_info.cc \
 			sql_servers.cc event_parse_data.cc sql_signal.cc \
 			mdl.cc transaction.cc sql_audit.cc  \
-			sha2.cc \
-			table_share_builder.cc
+			sha2.cc table_share_builder.cc
 
 nodist_mysqld_SOURCES =	mini_client_errors.c pack.c client.c my_time.c my_user.c 
 


--===============0240999935==
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: 2df360a1f598506f72267cff088e0a04f8d0f2b1
# timestamp: 2010-07-12 14:50:01 -0500
# source_branch: file:///Users/kevinlewis/Work/Mysql/Clean/mysql-next-\
#   mr/
# base_revision_id: kevin.lewis@stripped\
#   ffm93ffe3e5wimla
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTha//MAAXlfgAAwWGP/93IG
AIC////wUANpr21TnRM03CSST1KfgQ2pqeEmyo9iTNSaafqh6gYZIRpPTEp+gU8ak000AyBpkAJJ
BpNNE000jUPNRonqGjEANGMAAAAANBoA0A0Ako1R6T1GNJqemo0bTU9NQB6g0A0YYJiiztk7318F
1Ug7hdQgfW0UVsTrY9sN1rMy19g8Ma9T0AcxQz4e/76x5obM1BcunlbDLd3hSA79uKNqAOvlrM58
QjLscdAcHC5eZY9RIU55IsR1FzCJJ2BHIvAiIwwEMQXBhjkw8hGU6k1SKd4a3pVFX3OA+KCjAX5U
qXYCOEYhzqMruYMDxLguu179SqvNNyzPF4sMw4fEokVlMCx5aW2TijOI4Z9U4jZCTGlchQHmfozl
bjjpZ3DSqf5FpiepmSUoZDQKPlNbVjZeFCsOz36MED1JekS2y7bYDANEiJB6eFQiKqGqCuNVzcKT
LykDq0HNxmLYoYtSRnOCk9lspYvoT01UigEKiGtywMGMhA1WsckmnZsiJMPRTWt9M3VyKnpXooi3
+0C42yWR17BonphdG5soGl7TE+cSZBNRpkwejeB8Osu5aLp5+iRxoVYY/MP3TwiX4QRX6RiM5ENx
zwIcu8ZpokdJ9mCdueHc8Yjs1xk2y8SdEZ5tlUZVWRixIZinH/sswQ2O8aOJiSoln0NuldmhwcyR
FIqafmq6bhtFZNqUydFlxwaRvI/o7cfxHKAA//QLFE516h659H7cnOyJpgYxh7dPQiyW/Xvxb7ZB
hnTOz6nED3TLeU4quzPC+Y4JEoWpFMif5HbzptNhSV8qzm+MV16mgaqr+b16feVX+UR1KEPo0MTm
l1F8uU4OocQLy4pfX5p0GMSQmJ1rxSMAp/LdbVhoSJgwbg432F+0g5aQ4nkOeWheL0OoJcikNpVn
ChdwtqQxediRt38axXiI5LU7VKW+xjSClzdyl0yLwZIYOx4hGcG//lUruQ7JlwwiYz0BeRQ9jHjM
9Rf9I6hMu7l24xiovVdjMoh8JLtj3iqJVIax3V1ZFyS1klfy2D86LDz3SwdwlwSGylY1a77sUBu8
uXf06NXtsWRpnfzjGJoR2xxke/d8aQ7rFQvC6UFp1I3WP2l8cfeKsSVxzixTJD82Q8YJAxDIV4tl
obMH/F3JFOFCQOFr/8w=


--===============0240999935==--