From: kevin.lewis
Date: July 15 2010 2:40pm
Subject: bzr commit into mysql-next-mr branch (kevin.lewis:3171) WL#4034
List-Archive: http://lists.mysql.com/commits/113679
Message-Id: <20100715144038.B91783F17BB@kevin-lewis-macbook.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1349708587=="

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

#At file:///Users/kevinlewis/Work/Mysql/Merge/mysql-next-mr-wl4034/ based on revid:chris.powers@stripped

 3171 kevin.lewis@stripped	2010-07-15
      WL#4034 - The previous change by Chris worked.  Now we try an idea by Vlad.
      We leave table_share_builder in the sql/CMakeLists.txt and instantiate it in 
      table_share_builder.cc so that it will always get linked.  It was not getting linked
      into mysqld because it was not being used anywhere there.  Only in infoschema.

    modified:
      sql/CMakeLists.txt
      sql/table_share_builder.cc
      storage/infoschema/CMakeLists.txt
=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt	2010-07-15 00:08:47 +0000
+++ b/sql/CMakeLists.txt	2010-07-15 14:40:33 +0000
@@ -75,6 +75,7 @@ SET (SQL_SOURCE
                sql_signal.cc mdl.cc
                sql_alloc_error_handler.cc
                transaction.cc sys_vars.cc  rpl_handler.cc sql_truncate.cc datadict.cc
+               table_share_builder.cc
                ${GEN_SOURCES}
                ${MYSYS_LIBWRAP_SOURCE})
 

=== modified file 'sql/table_share_builder.cc'
--- a/sql/table_share_builder.cc	2010-07-14 15:00:14 +0000
+++ b/sql/table_share_builder.cc	2010-07-15 14:40:33 +0000
@@ -35,6 +35,12 @@
 #include "sql_base.h"
 #include "table_share_builder.h"
 
+/*
+  Since currently, no other module in the sql build instantiates this
+  class, we do it here so that it will always get linked.
+*/
+static table_share_builder my_table_share_builder;
+
 table_share_builder::table_share_builder()
 {
   m_object_state= UNINITIALIZED;

=== modified file 'storage/infoschema/CMakeLists.txt'
--- a/storage/infoschema/CMakeLists.txt	2010-07-15 00:03:43 +0000
+++ b/storage/infoschema/CMakeLists.txt	2010-07-15 14:40:33 +0000
@@ -45,7 +45,6 @@ SET(INFOSCHEMA_SOURCES
 	table_tables.h
 	table_triggers.h
 	table_variables.h
-	../../sql/table_share_builder.h
 
 	ha_infoschema.cc
 	infoschema_base.cc
@@ -69,7 +68,6 @@ 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)


--===============1349708587==
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: 04617a00e6f5a49369f746dd6b04c96e416b962f
# timestamp: 2010-07-15 09:40:38 -0500
# source_branch: file:///Users/kevinlewis/Work/Mysql/Clean/mysql-next-\
#   mr/
# base_revision_id: chris.powers@stripped\
#   41b3y3rdnohgy3ql
# 
# Begin bundle
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


--===============1349708587==--