From: kevin.lewis Date: July 13 2010 8:08pm Subject: bzr push into mysql-next-mr branch (kevin.lewis:3165 to 3167) WL#4034 List-Archive: http://lists.mysql.com/commits/113509 Message-Id: <20100713200904.5091B3E02F3@kevin-lewis-macbook.local> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1903371099==" --===============1903371099== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 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= --===============1903371099== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/kevin.lewis@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: kevin.lewis@stripped # target_branch: file:///Users/kevinlewis/Work/Mysql/Merge/mysql-next-\ # mr-wl4034/ # testament_sha1: f6eba440bbce82e7f876ebe65ec9390fc864328f # timestamp: 2010-07-13 15:09:04 -0500 # source_branch: file:///Users/kevinlewis/Work/Mysql/Clean/mysql-next-\ # mr/ # base_revision_id: kevin.lewis@stripped\ # icvc6oaq774txzdf # # Begin bundle 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 AsLTxJn/xdyRThQkKCE5ioA= --===============1903371099==--