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

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

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

    modified:
      sql/CMakeLists.txt
 3169 kevin.lewis@stripped	2010-07-14
      a test

    modified:
      libmysqld/CMakeLists.txt
=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt	2010-07-09 19:03:58 +0000
+++ b/sql/CMakeLists.txt	2010-07-14 19:22:39 +0000
@@ -42,6 +42,7 @@ SET (SQL_SOURCE
               ../sql-common/client.c derror.cc des_key_file.cc
                discover.cc ../libmysql/errmsg.c field.cc  field_conv.cc 
                filesort.cc gstream.cc sha2.cc
+               table_share_builder.cc
                ha_partition.cc
                handler.cc hash_filo.cc hash_filo.h sql_plugin_services.h
                hostname.cc init.cc item.cc item_buff.cc item_cmpfunc.cc 
@@ -75,7 +76,6 @@ SET (SQL_SOURCE
                sql_signal.cc mdl.cc
                sql_alloc_error_handler.cc
                transaction.cc sys_vars.cc  rpl_handler.cc sql_truncate.cc datadict.cc
-               table_share_builder.cc
                ${GEN_SOURCES}
                ${MYSYS_LIBWRAP_SOURCE})
 


--===============0006516949==
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: 2cff5ff4c4323e618a1535fa4d88e94b9b9a05ed
# timestamp: 2010-07-14 14:23:08 -0500
# source_branch: file:///Users/kevinlewis/Work/Mysql/Clean/mysql-next-\
#   mr/
# base_revision_id: kevin.lewis@stripped\
#   dyycfvllubowpc41
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcNV8TQAAWDfgAAYUGP/91oG
AAC////wUANGbyZcdW3ekEkkBPKaekwhPUxPSeo9TIyQ9I0wlITRiNE2qfqbVB6QBtEA9QGGRDU9
I1GTEJpo0bUyDQ0AAyUm1PU2p5TNRoZNA9T1AAAASUmVP0Cn+kp7SnqbaUyGgAAAP2Yt1++pXdQm
q1vCxgntnkaR10Qdori9mZdvdd5Z/AfIVSyyM3N/a3pJ/GXRjy7z6ow3T5JzCvjPQTCJxfvsdBq7
hrcN7Z8MLqLpJEyRedCvG7VIlEtuEARYoIXXS/YwB2jFi7mfOA2h5SoDTZIEd+satktwhGTWPjev
NJIHEYmsI24pppcbn0QKyMaRaOmt1RswExahEFv2FgtnFWaCudpNxGMIBKepaWZfJgJ8iCq4bmHl
HutgxRyUIT1JckoGd4K9OHgxUsZD5RIkS5CAstW7Gdiii5EGV/eAYyjYVvFNLoPJzM7SWKOvgmEo
r6xSx4hLftSZLOY8aWyvvRxUKSoU9it16jOLZB4zfFgWlXGUC9FBrxGNgzQwBsurMZ4LmSQLZoCo
KUqSQkA1ScRw1OmWJXfy4EiDoEROcoDmjoLQs0YxU2Bl0/+W2w03ohQtfdUGvE4bIN8hNMYoOWOq
eeNnJnHjbN48XGwzW7vp4Iq0VaXENa1GEhglm6yOS8MLmZI6FKRdAjZwoKbB6mTSLLdmbc9DszaU
sc/q1UoVdBhjLKQo44zX+fAd8ZTUg0Lf/dqhyc2MPswrjBqX1ERjAsTlnxjZbtOjWsYr1GSLwZI8
5xVeKoT37zI4+nEW2kYtL/rlr32OMjyVZV5oiLcRyoOCNr9h2ZmKpBxbyk93ancFC7BPM96RMG+q
YvyCR/JFgf3cZVraUOhqiAfB7ilnmUDgQE1Mw7xI3g2oMiKQz+TmXVImK3iv33qAMHMQ2kxVMktt
Q7ZuXfUwfershIQ9jQAhJUuGTqRFChrsjpGckMjAcVD6SIgTHDIXYy1poeiGsyiIXZSDOC2pczxB
wZ2xAsJNsQZ9NwbdUbPHCNGa1CsjaSEthQbEmGARjxYZZI/nEzAmUv9ToRVUW/tsEz4HLlPDsoHA
oAhtSF2AazPQGmVdehksNX4OLCSswBkJFIqvnMNoUooBGhECBQNhywea7wqDOoP8XckU4UJDDVfE
0A==


--===============0006516949==--