From: magnus.blaudd
Date: June 27 2011 1:50pm
Subject: bzr commit into mysql-5.5-cluster branch (magnus.blaudd:3376)
List-Archive: http://lists.mysql.com/commits/139907
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6285416175869794318=="

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

#At file:///data0/magnus/mysql/5.5-cluster/ based on revid:magnus.blaudd@stripped

 3376 magnus.blaudd@stripped	2011-06-27
      ndb
       - add MCP tags for CMakeLists.txt changes

    modified:
      libmysqld/CMakeLists.txt
      sql/CMakeLists.txt
=== modified file 'libmysqld/CMakeLists.txt'
--- a/libmysqld/CMakeLists.txt	2011-06-23 06:59:40 +0000
+++ b/libmysqld/CMakeLists.txt	2011-06-27 13:49:57 +0000
@@ -87,7 +87,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc l
            ../sql/sys_vars.cc
            ${CMAKE_BINARY_DIR}/sql/sql_builtin.cc
            ../sql/mdl.cc ../sql/transaction.cc
-           ../sql/abstract_query_plan.cc
+           ../sql/abstract_query_plan.cc # MCP_WL4784
            ${GEN_SOURCES}
            ${MYSYS_LIBWRAP_SOURCE}
 )

=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt	2011-06-23 06:59:40 +0000
+++ b/sql/CMakeLists.txt	2011-06-27 13:49:57 +0000
@@ -38,7 +38,8 @@ ENDIF()
 
 
 SET (SQL_SOURCE
-               ../sql-common/client.c derror.cc abstract_query_plan.cc 
+               ../sql-common/client.c derror.cc
+               abstract_query_plan.cc # MCP_WL4784
 	       des_key_file.cc
                discover.cc ../libmysql/errmsg.c field.cc  field_conv.cc 
                filesort.cc gstream.cc sha2.cc


--===============6285416175869794318==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/magnus.blaudd@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@stripped\
#   jg3pjwa36935fw1g
# target_branch: file:///data0/magnus/mysql/5.5-cluster/
# testament_sha1: 446eb1dbe1faea4aa39fb7b96d4d036f41651575
# timestamp: 2011-06-27 15:50:55 +0200
# source_branch: file:///data0/magnus/mysql/7.0/
# base_revision_id: magnus.blaudd@stripped\
#   yufx6akvyveoyimh
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWaSzlmoAAhnfgACYWGP/91oG
QIC////wUAS+6HWhr3eOttSOhwkqaJ6p6j9I0ymmyaNMmUzQ00m1AAEqmhDaamjyMo9QaBoAAAAJ
RCNMqfqn6mU9Rk9RtQaHqBhHqHqZNBilPRlGE0ANBoAAAAAkkQAaaExNTEw1U9pqR6nkg9Iwfuu3
3sN9foev43z5Z+PD1rLk14L5gRbykbg99uKQ5WljM40qFVUVcdoZOe3mi4cqrIawMujrL4y2luN1
VhUyPZghlLNWfOMeJ9afCHsg1XdqQ+UL56f4DrvI5TuAf/uDonU816+v0JaYWHIFbxeeYBIliXyE
ZTMsK+FCX7Mma947YQPZlJIbiPkYBMhZIeOHWzg9ancrNaZVKWinZlz/iKmQpjIjz5laFTPEgdpE
1cUyuc5DGANrhJBUpbUDHvpjFoglI7CS4uELR8A1m7hIyFvVxIxasB+RkXDidSxv8i1pSulI/8fp
KmIcTVOx5wJSzWMCLBXHS0vIUk3gPuA5wJTGfEqspfuoMugH5LTEg1VrywsB8FoOdywlT6j7HGow
AmJpFv0hpzppoNBta4zEpzUWOpIBlNuGPMr7TETLfCIESucmp3g17kJ3ZxrEltJysDkX47pgZMXq
4ykNi85zkz2Kx4DzBIgbfF0uZEZRlFjRChsUQOTOhRbJysRqhFKHuolmLsgzEuZiCzAxwdQZ1NiB
cpiZ5AC++YMWlttH1EDAtvLyEXxNVicU9kcygQCkYUg1gChTS4iFy4miQPCGBNC3EcNBFHiqouWe
k/Uo3io5N4nA+iUylE1DDriwI6B58W4uA2EyfNxhjP27ADvKS2TIj1BS6kwKi1c5xu8hm0Z0sBya
CulmOalv4IvPAFQS3xmRXJNv5OiIFmJi8twhojqjY8JV4ohiEpX940s94udwgRMttxTHANDgWUBJ
ISotBVGctBTmCbOk2rxd1fKbdAIzbqsWZiKQrLDicZ+DBj6yjkOmcbKK6GswhdxIRlgpWo8K8xG5
SKKCpfRava3q0E4aSZwLEVIfuDvs45YwG9N5xUFf9zidTrxcoHGsDRdCRL+AqEzvqM8CF7abDaJ7
URvcCcpKjSilQbbHpK/hDSTdFiJx7rjmiz8c8X5IgeiPlQDOUdEDkexJ0PMDWbDkUjSpRPBAUItH
0Tla2hCiRgZToCyXEYlYMCA0QdwOn32ETW0DkLWsD3TwwaEKrJpIIz2kNXzTKe+ifeTDkdh0iJ65
XyYxPY72d5Ep2DwSgnq+O1HAnLi4AonYLJylvyJeEPXJywuXnVAW6DDA9eCfnqB1LOc9FBzNjcdN
rgqrIcmwSBNgIiik0mXLZLXzh5k4RQRzvDnIsOK2AXgCZsodKzFDFF5QdGKDY2ZmpccpC2xGZak6
vRK869pHmhKG/c7DB8gcO9Om+BOixMMyT3BdWd0nlJhiS1gvg7Ga2tqBR4aD1Mq0aUWbHZPA7FIH
oanY5jHcca0LY9yB0pSii2hmGGPNUGXexVJ55WnYlpKB/i7kinChIUlnLNQ=


--===============6285416175869794318==--