bzr commit into mysql-next-mr branch (kevin.lewis:3171) WL#4034

[kevin.lewis]

#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)


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