From: kevin.lewis
Date: July 13 2010 8:08pm
Subject: bzr commit into mysql-next-mr branch (kevin.lewis:3167) WL#4034
List-Archive: http://lists.mysql.com/commits/113508
Message-Id: <20100713200803.56A7F3E01D5@kevin-lewis-macbook.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1434978229=="

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

 3167 kevin.lewis@stripped	2010-07-13
      WL#4034 - Add table_share_builder.cc to libmysqld/CMakeLists.txt 
      and libmysqld/Makefile.am

    modified:
      libmysqld/CMakeLists.txt
      libmysqld/Makefile.am
=== modified file 'libmysqld/CMakeLists.txt'
--- a/libmysqld/CMakeLists.txt	2010-06-26 07:56:33 +0000
+++ b/libmysqld/CMakeLists.txt	2010-07-13 20:07:58 +0000
@@ -84,7 +84,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc l
            ../sql/event_parse_data.cc
            ../sql/sql_signal.cc ../sql/rpl_handler.cc
 	       ../sql/rpl_utility.cc ../sql/binlog.cc
-           ../sql/sys_vars.cc
+           ../sql/sys_vars.cc ../sql/table_share_builder.cc
            ${CMAKE_BINARY_DIR}/sql/sql_builtin.cc
            ../sql/mdl.cc ../sql/transaction.cc
            ${GEN_SOURCES}

=== modified file 'libmysqld/Makefile.am'
--- a/libmysqld/Makefile.am	2010-06-26 07:56:33 +0000
+++ b/libmysqld/Makefile.am	2010-07-13 20:07:58 +0000
@@ -81,7 +81,8 @@ sqlsources = derror.cc field.cc field_co
 	debug_sync.cc sql_tablespace.cc transaction.cc \
 	rpl_injector.cc my_user.c partition_info.cc \
 	sql_servers.cc event_parse_data.cc sql_signal.cc \
-	binlog.cc rpl_handler.cc mdl.cc keycaches.cc sql_audit.cc
+	binlog.cc rpl_handler.cc mdl.cc keycaches.cc sql_audit.cc \
+	table_share_builder.cc
 
 libmysqld_int_a_SOURCES= $(libmysqld_sources)
 nodist_libmysqld_int_a_SOURCES= $(libmysqlsources) $(sqlsources)


--===============1434978229==
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: f6eba440bbce82e7f876ebe65ec9390fc864328f
# timestamp: 2010-07-13 15:08:03 -0500
# source_branch: file:///Users/kevinlewis/Work/Mysql/Clean/mysql-next-\
#   mr/
# base_revision_id: kevin.lewis@stripped\
#   z78ncmd54y4zajis
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfboOKEAAfbfgECwWGP/93oG
AIS////wUAS54UDt7vJewAaCSSk9TPVN6pmjU3oo9TZTE2hlNA0BpkEqFNMmmjyZCaaAANAAAAJU
yE00FPNKep5R6agaGgAaDEaBpqoemUMgNGmmjRpkNAyaBpo0CSQjRoARpoATQ0UyeUBhPTUrHvOD
TdhkajX3eO4yorSddGWGiUmMJyKzTtc62bag2ae3AQzEERE+fYi6FDixrooIjUXOPoa9+LuNVsNq
MHD3A7K6G3D7fcv3kcPQHsI9tvdtJFQyFoTAf4XHE3xeQHff7bdKDivK71M7eQUH5ssfug7AnBMC
eEjAfdMbCwkREZNZvB5iyQ4C9kJh1O0O52UDzpiDjR2xMkTjAfaskFck4pfPBWE7LkdZkM80JGHN
EKj3c+EH00XyZEQC0F00NKrIEWRw1Z3zlJGysfLHxgFk7RL87AeAyF55XYFVjjaUlAyvkRKNIImK
PkxOp+CzYB8EbrSs2YFl9ymYRWQJmGWuQ0Im/5MB4DjWUWFrTPP4wtC8gTPgXrg/QbANSxNZAs+S
ddlC2+jrQNfabFRrMFmEpGs4OA69KSckV7TQvmmwnLzJxSsy2AxQPmNGnwHbjbqgF2PWYtLVYST0
yRsmswsIziH8VReXXA4mIt4lDXiIpJGgUKYiZE04pokgqLK5IsbE5SH2EwxEIDVkY3pSVWUvsrMa
SRRULjeXKIr0ugj2E0GseKAVlSKQNLPRIXGFDmF9A93EoCQh1guAkg+2l2vjH5Hw10ZzprLh6VnJ
49MP5QDiMatZicjUt5zqUq9uwFfx0wlkR1LivQZiQiXWKI0r6o62WRLfBf2ykoGsJzgWHmBWUmd5
tPvKqA7ZVWoiYW5/grXzgai8uu5H15IK/TD366rRmBbB6xKRKPsaHs0/B/qWjG3vuu6q0kE4NRUX
xRpvG6HxxLlHstl1mwr+QPA1ZzCCO6e8pqpuhqCMxmOGa07C6Frh3kXLKPQyu0FwjnHOXLKmrZCt
SylMMKh8cNRAhILI0j0i8Dr1giBSRrKgV9SJp7gywM+I8kvQsXwaw7HsXMc/MBryo3HW4XcDsZnP
9huAvoyrf4jzAMd5wkDattSGm6Kc81vEQNPAFtNqLfL44a4ZI0BfKkj8F5h2iP4JxuPI8DwMicC5
f0e6YcZ0G9E5wOh1wY6BaBngjGATVMGCDEEwblL3BTnQwLyQ27p7GXgXxHkV4oUi8imVUym2YG98
IKop+oD8gojcOBOYZSKbk0ENWTSg2g76Gs5mQoMDLy8oGrKtJTopgfIKKKFo5W2Ge8WWbDA9TTnq
VZkmj3OxiSOZcBAtArNJ80rkBugIr44qfroUKT8Z6Yz8joOWuFIbgTaYQgrg42oqIIccykOXY7Mz
VuMHBWVokHIdQBHTJla0fI6k0xMH8xsyhIvgFT4xxkj0QW81DrwdLgyawtMUK1oeUDAU2AOwrcgJ
zQYkdyBee4DgXNxtHGR1PEBio6nY4hIUUfVO7lBaczKtEB5YtKVvVJLgUH/i7kinChIe3QcUIA==


--===============1434978229==--