From: kevin.lewis
Date: July 15 2010 6:04pm
Subject: bzr commit into mysql-next-mr branch (kevin.lewis:3172) WL#4034
List-Archive: http://lists.mysql.com/commits/113696
Message-Id: <20100715180443.6C7673FDA0E@kevin-lewis-macbook.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1205643023=="

--===============1205643023==
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:kevin.lewis@stripped

 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
=== 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;


--===============1205643023==
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: f6a921fa7f43c33f09c49918f08769b06cdcc7f4
# timestamp: 2010-07-15 13:04:42 -0500
# source_branch: file:///Users/kevinlewis/Work/Mysql/Clean/mysql-next-\
#   mr/
# base_revision_id: kevin.lewis@stripped\
#   tr6tgrznulqx3but
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbKKLaMAAs5fgACQWHf//1oG
CIC////wUAXu7eN1mhaOad1pqUpGEpJpNqYUybTNMmlM0DRGjTQNBoGAAAAAAAAAAASRBNSeR5TU
NAANAaAAACSRMU9DRPSNCaYmiPUDEaaDQaBJIJqPUwJ6TEajJo1T9KepkeoBobKRFleenNbhLEkX
ry72MUY4jN0a2jEHZdc2eQFqBLUWpkOEJug/DbsE8O+c8yKZcUzDDMj7eQvSyV2D8bXDNYYm0ZMz
zalroV9PVnsfDL2/Ybuffm3DAkaFpjCCowMPhyxJHT4TT9Guq7ddrMg/5UzGl7JuIkahEdzvi07V
21xwLbzA7HQA6H2GMu12uzzIuq5QEXxNpwDQ6uIOPajNeGs/Soy+7mOwgdvQEF+PLcoYSTi4sCjm
qQFnR2TxszoREG94gYcYtEf6jxhZepERIJDuIHyTkYDiIJykEZJpzbLiJSSuiSv00FBk633TBHix
ceVSPbQdFrJPsvyxzxMvRDUCQXdOEhKdC6t9+jHARjlN/GMG0TKGVRsvmezmiEBUBHTQyK8ON87C
0YoROPwI3xOJwnOIvkxfTj2zNyefBvcqSLTGAOCY5PD1lImOIIgN4DUgMYlwihUucawuH7NpfmPO
okRyuMRg8+WDxDI1DUZb2hc82CGIBQQ3Kp5X7kzIJlKy4rrm3BKoKGkvk+TMswuYwv2EXWCXEjAu
IklYcjIXl0Md1bix50uLayRE1lccjAY2lhfDrO1cS0RE0tNarTmOxsRTzvxHvcTN5oEzwVZEYFdV
M3uW9klZ9TePZKDRlPZkRYkX5rM10RtGHkLSveW0hczXubNsDpDRIjk4muVM5EnUzVpa58JGAh4U
GUFR9CpgbYkB8imOU8DXPVQeVceBPRIZi5tN97QAjoeERyGk0AgKMm2fAOetTGb3rAT2br+a70A/
QMzAx+4P9W/nHm8C6icgt7Hp4G9OXiQgiTKwv2mTEsbdpPGgDyHoBoM0pljE63mg5WWJQxcW5oGR
A4vnjVMpnPfswGlwbzhg4fdwJnVgOKeOl/8BUNXIzdSRRwvqcFTUYZ1PWFtWt0PlbEfF0BDxNyVA
KFkBnsO5K1RKgi1ZqnK3PppKUNDELBeEiJZMQMqJMp8hAG1rhpOdUnnVbQG/CJBDdjGEe3FCQnzl
Jtoey9VpzZbXfS8CxViYC681pLD01rbSs7kiBzhOJHG1tNXFpdMXxTI31qzLuYI5usuh2R5UNtEB
eLNAUkleSwDU1gGLGRAoIwIZ+YxwgDoeJQKjqmrYikgXG4bGYKVf2xvG6kRlJaHo8ziGujYK6gEj
ne43N3itTJKByYs8nUZ2Pb8kuo6MwrQcBHeBceCA+f47i35YS+OudWYva1AWC+0yZykn4HI3jzqE
Q2lVA8DnG0cVF+DzBk44i6CIFDyG9oF4cMBQeEFf7OZI6PQDg0ZdwPwQHsZ8ZmN5mT4OKcOg4ImO
j2W7z6IDgRJqSs34DqcjWYFi5GUScwtNXcIjyhdQuZAMlBYj7auS0xueMkN9TZLA9y49ZbgqYHMj
YDlKOPjQ0m5rkBNltLBgtgf5AbhXrrcr9OXFZ86VSju3OTI5wCfMorzjAlwORMicaApmBENwddzk
G8wNYP0pI1OkB9Sj3hoyKeUQj6eJNYn0LNaseNk9r9rtjHkHTOWmUlBANCyE8l2sYCWgTK2aO3V0
XYzM6Y8oxY8fWhXZgLBNOL2i7ipN04RsVgqGijMV1LUotXK2YufuDjMZxB9js6D6xMsgbY9Reind
TLSu1pc0D9doVm7xjSQakB8l5nJJE+PoOn3M1f3MjagMI9TsI7BA4ehcdT9Dh0VYEi5jcdpkInlr
UYxIdAgIPJwlmP8XckU4UJCyii2j


--===============1205643023==--