bzr commit into mysql-5.5-cluster branch (magnus.blaudd:3376)

[magnus.blaudd]

#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


Attachment: [text/bzr-bundle] bzr/[e-mail]