From: kevin.lewis
Date: July 14 2010 7:15pm
Subject: bzr push into mysql-next-mr branch (kevin.lewis:3168 to 3169)
List-Archive: http://lists.mysql.com/commits/113625
Message-Id: <20100714191528.5C2F33EC742@kevin-lewis-macbook.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1195746610=="

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

 3169 kevin.lewis@stripped	2010-07-14
      a test

    modified:
      libmysqld/CMakeLists.txt
 3168 kevin.lewis@stripped	2010-07-14
      compiler warning

    modified:
      sql/table_share_builder.cc
=== modified file 'libmysqld/CMakeLists.txt'
--- a/libmysqld/CMakeLists.txt	2010-07-13 20:07:58 +0000
+++ b/libmysqld/CMakeLists.txt	2010-07-14 19:14:42 +0000
@@ -41,7 +41,7 @@ SET_SOURCE_FILES_PROPERTIES(${GEN_SOURCE
 SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc 
            ../libmysql/libmysql.c ../libmysql/errmsg.c ../client/get_password.c
            ../sql-common/client.c ../sql-common/my_time.c 
-           ../sql-common/my_user.c ../sql-common/pack.c
+           ../sql-common/my_user.c ../sql-common/pack.c ../sql/table_share_builder.cc
            ../sql/password.c ../sql/discover.cc ../sql/derror.cc 
            ../sql/field.cc ../sql/field_conv.cc
            ../sql/filesort.cc ../sql/gstream.cc
@@ -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/table_share_builder.cc
+           ../sql/sys_vars.cc 
            ${CMAKE_BINARY_DIR}/sql/sql_builtin.cc
            ../sql/mdl.cc ../sql/transaction.cc
            ${GEN_SOURCES}


--===============1195746610==
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: fdf9f3b9b33e018659e62ffb7abf173ecb05dba1
# timestamp: 2010-07-14 14:15:28 -0500
# source_branch: file:///Users/kevinlewis/Work/Mysql/Clean/mysql-next-\
#   mr/
# base_revision_id: kevin.lewis@stripped\
#   h86rpjhtf691t59s
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQ56cjcAAXffgACQUGP/91oG
AAC////wUAN6e1rurlad3ve0EkiATJpk0ZNE8ptE9CExqNNoMoT0p6NU/AmpNPUeUBoGQyAYSSaT
TRNpJj1RiDTQNDTRoADFSeSe1RoyaBkANAAAASSBUeNT0jSeUwNEDQDQNDQKc21n4duUrWAQpXBB
oq0nteFl5gwOScytVmZe/UO8EVbmal7tL3Oz9vzXR3ZdWLIKPrRRhkOYWx9cZ9CH+59Gi8W1WyQN
D82WWmNLNkGuiK5v7ekUpDlI7RA4wrChJJ7Z8VMgIbSZy14iDl1K6S14VkkKJaQLVdcnLmvewwCb
KC6JCN2UnztB402Y7N0pLOooPMiLfXRXxw4a4ivLHVULnvJpyDNUXsI2WUInzRRDueHg46Nf2aXk
ZXtOEzJ4595p1Sq2MfHMXS1F/gyWHSpGVykhkDDbWiJ1pRxAU2MiKFziD7NDSuoUqAD9Q2B9KnPT
KZSzdaMZECc3rUFwx6zjWpRX4Ko7QMBEX2PKy6VNXNktV5GeLtqHMhGncsw7mSDC99H6xOYcJMcD
Y2lKVBEVgEK6QGD4sZepAW0csIJrWsLAla2405yfZVa/TvSJTZMcbHOLTvgiO972zgx2RBt8yqtb
CC3Kf0OaRTK0RpgDv2LzrZoioqoR+SrLjp5/z1dnYMp9XqLf/oz1MkdKq0YtURv0yGc/EWvLyDMk
Zy6aRmc/jZwZt9MS+u2JEpipSUHVsdBPB49r+MIpEKQo61+kpWQ33/mGeUfxmzu3SqUGm6buVB5T
1ooV1JHaoUUJi+YxKi/3F1maaYBLyQ4CxIjcUiUvW+0mPvH5mY35NuFbgjllBxTWoj8KcOFZba2q
bsmh4HbanlmCRwCj/3VPrDYkRh4rMIXYp1q5nA3qcPs8RnGgIHsYo2hVmmFIBHeUSGOHqkYyJ4dW
kW0wSltN4ihYrnria3TEYlN+l805skMjrm4FlzVlvFUpDkUap5mBLhMEIOH4kawIHREbUwOmHUa2
stRzBQOgX5N2jpDhLugDlzbCIEmlwL85hvncSLY+v4U0cWDLZIr0hrqo+6uqwYpJQbGZY8vJmKEF
IWAYqN9ykzrdp5F73iO7EoW6Tn6FqKJQwEgCL3LVzV5MKjDzl3Hw6ZWpKEW1pOhme8SRhrE8cV8T
noOV6lCJQ4ijLKoCkTzdcZk0h+i7kinChIBz05G4


--===============1195746610==--