From: kevin.lewis
Date: July 12 2010 5:28pm
Subject: bzr push into mysql-next-mr branch (kevin.lewis:3159 to 3160) WL#4034
List-Archive: http://lists.mysql.com/commits/113384
Message-Id: <20100712172855.5564D3C9D50@kevin-lewis-macbook.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0825349096=="

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

 3160 kevin.lewis@stripped	2010-07-12
      WL#4034 - Fix mistake in storage/infoschema/Makefile.am

    modified:
      sql/Makefile.am
 3159 kevin.lewis@stripped	2010-07-12
      WL#4034 - Add a a constructor to explicitly set m_object_state.

    modified:
      sql/table_share_builder.cc
      sql/table_share_builder.h
=== modified file 'sql/Makefile.am'
--- a/sql/Makefile.am	2010-07-09 19:03:58 +0000
+++ b/sql/Makefile.am	2010-07-12 17:21:59 +0000
@@ -132,7 +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
+			datadict.h \
 			table_share_builder.h
 
 mysqld_SOURCES =	sql_lex.cc sql_handler.cc sql_partition.cc \


--===============0825349096==
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: 570cc607136062340226d8eddb77baa89f7d1a19
# timestamp: 2010-07-12 12:28:55 -0500
# source_branch: file:///Users/kevinlewis/Work/Mysql/Clean/mysql-next-\
#   mr/
# base_revision_id: kevin.lewis@stripped\
#   3vq1c3c5irw4537s
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWe/rdHwAAXtfgAAwWGP/91MG
AIS////wUANK1vdRzdsdnbCSUwmo8qPahN6JT9KDahm1Tagaeo0aDJIp+m1Rmqe1T9JPKfqaT0an
pA00DENMJKNDQUmaCgzU2apoDJgQw1BhoaAAADQAAAAAkkQEzU9UZM0aaaEMg9IAB6jMT3Y+9vv+
fEha834ZUA3vc6L7sb418MWZj8dF1fexIRiC7fD4575ub+SF6Cu3jB6/PkWIR7a5JQ4A3g8by3r7
vMaGNrb9a27ElLWkYeb3arh6OY2bYaDhHOfeIYYOJbSxHeNUsbtFkjopYeZVYks6x0i6WBN2RIGR
jnqk58aIJXS7dlFtsvqfudY4JK3xz3lnF5O2BDYaroi6YK4ZgR4NnNoKAvkcJqAa1jRFoENMq1UH
kZXkQ1vtYqkGGnsmDYriynPAeOU1ZV43OVDG2AocRclkF083GQxK/TqMHCRvLW5l7MDhWuFAplE4
oqnM6mqtW2BF1hlKyfI9UXiumJiAiIrb1rLYwqkjUZMXN9RSTRw8GHT/KuV3xumNWMMYAlsg2im2
dyRuHMHIVsUMUjtyxCgn1MUIqDwmTCjw6z666w35LPw5JE6wUD+R5/R355X0Oi/Wx2RDVrrUzuPV
2miRScXUYNB/p2jO8lVoR7JokUbv73NnxryhuItjxC73HlZSTgw5nhq52x4cyTmSOCRe7b2VlMzE
1xWpk0hImI/FPHQOJB0cRthgZMMbTnY4cknszdZo0bUsondeIbcZYZIxXAU0rctex6YxI1VDSklY
Ksh0TLI+2Vsa+3jQqkawySNmpQ3nBtljueNMp6RDlpqg47XNutFXu43lgZ6H8oLRFimUtNRF2zFN
O8ik4zF6RcEMP3Vmk6g3rkkUhpMZeDHgLSbxXKdgrCJ5jOLA5lwR+yAayModiIpDdzcEiOnhQ9YC
LcT5qRLZcjw9+bdTuVtMaxGCRBBajA04kP1UlNEGTKwpuKQ2pDm6l5iJj6RPVI+aNa0uV1aexbu5
mTh9ZWfDacl4rWdRSylZUANHonngR+F6pujPS1sLSwoSG1zdWRqOrM4BMQpxyySjDOqdmciyNOtm
YjrI6XOr7U254LIuDQXN7tsuNG+ngKq2JLNVXAckWgKnQcPCKcRrEh/xdyRThQkO/rdHwA==


--===============0825349096==--