bzr push into mysql-next-mr branch (chris.powers:3170) WL#4034

[Christopher Powers]

 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 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt	2010-07-14 19:22:39 +0000
+++ b/sql/CMakeLists.txt	2010-07-15 00:08:47 +0000
@@ -42,7 +42,6 @@ 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 

=== modified file 'storage/infoschema/CMakeLists.txt'
--- a/storage/infoschema/CMakeLists.txt	2010-06-09 18:42:52 +0000
+++ b/storage/infoschema/CMakeLists.txt	2010-07-15 00:03:43 +0000
@@ -45,6 +45,7 @@ SET(INFOSCHEMA_SOURCES
 	table_tables.h
 	table_triggers.h
 	table_variables.h
+	../../sql/table_share_builder.h
 
 	ha_infoschema.cc
 	infoschema_base.cc
@@ -68,6 +69,7 @@ SET(INFOSCHEMA_SOURCES
 	table_tables.cc
 	table_triggers.cc
 	table_variables.cc
+	../../sql/table_share_builder.cc
 	)
 
 MYSQL_ADD_PLUGIN(infoschema ${INFOSCHEMA_SOURCES} STORAGE_ENGINE DEFAULT STATIC_ONLY RECOMPILE_FOR_EMBEDDED)


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