From: Christopher Powers
Date: July 15 2010 12:08am
Subject: bzr commit into mysql-next-mr branch (chris.powers:3170) WL#4034
List-Archive: http://lists.mysql.com/commits/113646
Message-Id: <20100715000858.E1E821DB0308@xeno.mysql.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0741227015260220007=="

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

#At file:///home/cpowers/work/dev/dev-wl4034/mysql/ based on revid:chris.powers@stripped

 3170 Christopher Powers	2010-07-14 [merge]
      WL#4034 Information Schema Storage Engine
      
      Fixed build break - part II
     @ libmysqld/CMakeLists.txt
        Removed explicit dependency upon table_share_builder.cc.
        Instead, mysqld links ../storage/infoschema/infoschema.a
        which now includes table_share_builder.

    modified:
      libmysqld/CMakeLists.txt
=== 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}


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: chris.powers@stripped
# target_branch: file:///home/cpowers/work/dev/dev-wl4034/mysql/
# testament_sha1: 84fdb2dbe1b4ed16d18c71c218d4692d0e2f3059
# timestamp: 2010-07-14 19:08:58 -0500
# base_revision_id: chris.powers@stripped\
#   8punrznubo24yhoi
# 
# Begin bundle
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
MKRwgA==


--===============0741227015260220007==--