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

[kevin.lewis]

 3172 kevin.lewis@stripped	2010-07-15
      WL#4034 - try referencing table_share_builder from another file.

    modified:
      libmysqld/CMakeLists.txt
      sql/sql_show.cc
      sql/table_share_builder.cc
 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 'libmysqld/CMakeLists.txt'
--- a/libmysqld/CMakeLists.txt	2010-07-14 19:14:42 +0000
+++ b/libmysqld/CMakeLists.txt	2010-07-15 18:04:37 +0000
@@ -41,7 +41,7 @@ SET_SOURCE_FILES_PROPERTIES(${GEN_SOURCE
 SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc 
            ../libmysql/libmysql.c ../libmysql/errmsg.c ../client/get_password.c
            ../sql-common/client.c ../sql-common/my_time.c 
-           ../sql-common/my_user.c ../sql-common/pack.c ../sql/table_share_builder.cc
+           ../sql-common/my_user.c ../sql-common/pack.c
            ../sql/password.c ../sql/discover.cc ../sql/derror.cc 
            ../sql/field.cc ../sql/field_conv.cc
            ../sql/filesort.cc ../sql/gstream.cc
@@ -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 'sql/sql_show.cc'
--- a/sql/sql_show.cc	2010-07-09 19:03:58 +0000
+++ b/sql/sql_show.cc	2010-07-15 18:04:37 +0000
@@ -56,6 +56,14 @@
 #ifdef WITH_PARTITION_STORAGE_ENGINE
 #include "ha_partition.h"
 #endif
+
+/*
+  Since currently, no other module in the sql build instantiates this
+  class, we do it here so that it will always get linked.
+*/
+#include "table_share_builder.h"
+static table_share_builder my_table_share_builder;
+
 enum enum_i_s_events_fields
 {
   ISE_EVENT_CATALOG= 0,

=== modified file 'sql/table_share_builder.cc'
--- a/sql/table_share_builder.cc	2010-07-15 14:40:33 +0000
+++ b/sql/table_share_builder.cc	2010-07-15 18:04:37 +0000
@@ -35,12 +35,6 @@
 #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;


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