bzr push into mysql-next-mr branch (kevin.lewis:3165 to 3167) WL#4034

[kevin.lewis]

 3167 kevin.lewis@stripped	2010-07-13
      WL#4034 - Add table_share_builder.cc to libmysqld/CMakeLists.txt 
      and libmysqld/Makefile.am

    modified:
      libmysqld/CMakeLists.txt
      libmysqld/Makefile.am
 3166 kevin.lewis@stripped	2010-07-13
      WL#4034 - Add extra/yassl/include to Makefile.am like it is in CMakeLists.txt

    modified:
      storage/infoschema/Makefile.am
 3165 kevin.lewis@stripped	2010-07-12
      WL#4034 - No longer explicitly define MYSQL_SERVER since it is now
      in Makefile.am

    modified:
      storage/infoschema/ha_infoschema.cc
      storage/infoschema/infoschema_base.cc
      storage/infoschema/table_character_sets.cc
      storage/infoschema/table_co_ch_set_app.cc
      storage/infoschema/table_collations.cc
      storage/infoschema/table_column_privileges.cc
      storage/infoschema/table_engines.cc
      storage/infoschema/table_global_status.cc
      storage/infoschema/table_global_variables.cc
      storage/infoschema/table_open_tables.cc
      storage/infoschema/table_partitions.cc
      storage/infoschema/table_plugin_schema.cc
      storage/infoschema/table_plugins.cc
      storage/infoschema/table_proclist.cc
      storage/infoschema/table_session_status.cc
      storage/infoschema/table_session_variables.cc
      storage/infoschema/table_status.cc
      storage/infoschema/table_table_names.cc
      storage/infoschema/table_tables.cc
      storage/infoschema/table_triggers.cc
      storage/infoschema/table_variables.cc
=== modified file 'libmysqld/CMakeLists.txt'
--- a/libmysqld/CMakeLists.txt	2010-06-26 07:56:33 +0000
+++ b/libmysqld/CMakeLists.txt	2010-07-13 20:07:58 +0000
@@ -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/sys_vars.cc ../sql/table_share_builder.cc
            ${CMAKE_BINARY_DIR}/sql/sql_builtin.cc
            ../sql/mdl.cc ../sql/transaction.cc
            ${GEN_SOURCES}

=== modified file 'libmysqld/Makefile.am'
--- a/libmysqld/Makefile.am	2010-06-26 07:56:33 +0000
+++ b/libmysqld/Makefile.am	2010-07-13 20:07:58 +0000
@@ -81,7 +81,8 @@ sqlsources = derror.cc field.cc field_co
 	debug_sync.cc sql_tablespace.cc transaction.cc \
 	rpl_injector.cc my_user.c partition_info.cc \
 	sql_servers.cc event_parse_data.cc sql_signal.cc \
-	binlog.cc rpl_handler.cc mdl.cc keycaches.cc sql_audit.cc
+	binlog.cc rpl_handler.cc mdl.cc keycaches.cc sql_audit.cc \
+	table_share_builder.cc
 
 libmysqld_int_a_SOURCES= $(libmysqld_sources)
 nodist_libmysqld_int_a_SOURCES= $(libmysqlsources) $(sqlsources)

=== modified file 'storage/infoschema/Makefile.am'
--- a/storage/infoschema/Makefile.am	2010-07-12 20:31:48 +0000
+++ b/storage/infoschema/Makefile.am	2010-07-13 16:27:07 +0000
@@ -23,6 +23,7 @@ pkgplugindir =		$(pkglibdir)/plugin
 AM_CPPFLAGS =           -I$(top_srcdir)/include \
 			-I$(top_srcdir)/regex \
 			-I$(top_srcdir)/sql \
+			-I$(top_srcdir)/extra/yassl/include \
                         -I$(srcdir)
 WRAPLIBS=
 


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