List:Commits« Previous MessageNext Message »
From:Christopher Powers Date:July 15 2010 12:08am
Subject:bzr commit into mysql-next-mr branch (chris.powers:3170) WL#4034
View as plain text  
#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}


Attachment: [text/bzr-bundle] bzr/chris.powers@oracle.com-20100715000847-41b3y3rdnohgy3ql.bundle
Thread
bzr commit into mysql-next-mr branch (chris.powers:3170) WL#4034Christopher Powers15 Jul