From: Christopher Powers
Date: July 15 2010 12:09am
Subject: bzr push into mysql-next-mr branch (chris.powers:3170) WL#4034
List-Archive: http://lists.mysql.com/commits/113645
Message-Id: <20100715000951.2007D1DB0308@xeno.mysql.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2745856562753637606=="

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

 3170 Christopher Powers	2010-07-14 [merge]
      WL#4034 Information Schema Storage Engine
      
      Fixed build break - part II
     @ libmysqld/CMakeLists.txt
        Removed explicit dependency upon table_share_builder.cc.
        Instead, mysqld links ../storage/infoschema/infoschema.a
        which now includes table_share_builder.

    modified:
      libmysqld/CMakeLists.txt
=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt	2010-07-14 19:22:39 +0000
+++ b/sql/CMakeLists.txt	2010-07-15 00:08:47 +0000
@@ -42,7 +42,6 @@ SET (SQL_SOURCE
               ../sql-common/client.c derror.cc des_key_file.cc
                discover.cc ../libmysql/errmsg.c field.cc  field_conv.cc 
                filesort.cc gstream.cc sha2.cc
-               table_share_builder.cc
                ha_partition.cc
                handler.cc hash_filo.cc hash_filo.h sql_plugin_services.h
                hostname.cc init.cc item.cc item_buff.cc item_cmpfunc.cc 

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


--===============2745856562753637606==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/chris.powers@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: chris.powers@stripped
# target_branch: file:///home/cpowers/work/dev/dev-wl4034/mysql/
# testament_sha1: 84fdb2dbe1b4ed16d18c71c218d4692d0e2f3059
# timestamp: 2010-07-14 19:09:50 -0500
# base_revision_id: kevin.lewis@stripped\
#   2y9gfcapl1zplkvm
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSq8d9YAA+VfgEAwWGf/93sm
WIC////wYAd/egHQFCtaAD6AABjmmJgATABMAAJgACYJKk8qfpqmzJqn6FPRqaAGgGgAGgDmmJgA
TABMAAJgACYMVTyamgBoANAAaAAaAAZUQaaB6Q00HqaZNNGjTAhoNGjQJJE0NA0mE0ATTICnqntC
aI8UbaU9h5cOJX4bvf2cH9w+Pqf0Or2w4vQ43za9+o3MBwYRAGvtfEDhIc5ga7bM5+LRqmUUggEh
HUJ8sa+aGGmqMFM9xAcOTNBqzcRmP+lhI/sITjmkX7Cb9N1guVbl2ZF1tA8UdRwnNJiShoYjcWpM
vMT5nCD5nbZJ3SgsFtZflIVgQVZvFqBfcVj0cb1rKzicw3mhiWc/E9DX2RDdfz2MFyEmvQcUgKSK
10XTyiOc7dBw6elMcbSpItZDxtZkCiwtBlQCnBoCckJwoMPSSe5ffDYngt84eDwVBe4QpwfDeFca
UUCcOuyiiZ8zyKGqKLLZqSYnIBIpZInOkuhSkl/Go0yDVrPekvRIIE5qnqKq7rSfWw2DTCqlWpXJ
VrDWWDRBBQHQgRcEWIMt4+G/oZWFASWIPE+81zuEy1BNBXbcC5CDWGOBpnRnaG0e9zhOCgy6ArKw
3ytdGMCwHz3kwRrfZsm0sgBp+9wTTbLr9pAJaH6/SNoVM2rhr1wiCeQhIzsSpCIWC2UJKM8zkVzA
6sqxHgxGrRjUWwqOYL/P3kKmyRWZ2q/6DA5KRSQelaJlh01VAsTEpNxAMq+NT9Bwm1U21jDDFKCv
x5NYKdHwDo67B7956BUhU9HBahDDNOhnM1ANyJ3F/VHcDBM1PwqrOlXicOqcbeiNiJLeak+l4TDI
XWZ80xkN1ZE2TItLJA8NkbZ7+iJKcz6hRJmSiivbXkyEndhhYWEdJ9SM8xmJRK2sYnBxiF2GY9LI
sgGTgdnz5hrrDG29iNeEayal+IWEyLY1vAq7J4pramkPLzMM5T2dAWFUBRc4rLh9ygGFRNDwxjIU
bJ2zkNvDOxQiRQ7IVsUhwtioaUE1MaUPSIudMhyKCgelMnFIzkPKI0gOiMaHujmblWxzikkGBEMF
aIq8IiCbLxlhIIJFRuMkvB6aHDfhh36JhfgUxOMDD0Fw0kwizo9PEy9ZCxxHCJ3BzZsMcYBuaeCQ
GrShJ1IUKTAtRQAzWJsUFvrrVZQWB2zFchRTJg8ZQrDvDIMhwn1dSbHZNPNgFGvzdWBoi0M/UF9u
RzD4FLqkMuciR3WTewXz94QwlfzG+DvDyPNMZIYcM78k+xhkJU/IU9FFqEmNkij5DgZiPAfw2yNu
dAcnHIwRYJ4WVn1rSgaUAbODH/mr4hRzrFLhAPBHkKwcj3+2BWOKkIGKSWV2vznnkOPTbmFFGTWe
cZ5BdtsN3kqlUeBSMerM72FtFAUQGFcE+GZORDEy5B+720qkODuv+cxAqMNricijccconrY4dn+R
5FBrF+zV3VI0RcJkvWFAyW/Ix8RIqIfYxIo1pdUXoLUEkHgrQJzWL1PQ7GzQ6dIrp3g9GQUYozPZ
WHqmWpeZ0Tk8cJixFF/mgLw0RQSNvucxRQFo2iq6AAliwCgawXUkctgBtgEcx2LhFwJJQOURhywc
HXrk52s+mYwhiek70agNgk8OXigbeBqNVR2+al/nY4FBYckGKMgRwQXoHH4VaBlw5nT4KlPoHRVo
6x5MfN6VYyDBBzRzA+qJsbQ7fcR1AkGpBAeKY/R/A4tHJF6EmV3oOEwoMj0QT19qkEnhxNFvkXYe
SQrQ6g4rFBBQlyVia5GoKNh4jjeVFJQiIxhbVShkDEmRMqCalgGYmGX8jB+C8gh/z9RR9C4zBVUp
FLJUgnC1e4XgnGJVVxRoLgC2ISsYrNzILSleJ8ISYFalO4Tg13Fn7JwQ8uAy3DJkmZPR/pF8TuMn
ElvDwwDbd0BDrC0/oFdz8tiMzoGaZhNYZF7CPqGKBGROKAnDArjsaIp8+Qkcqkrj/ZynkfyoiRax
TsYUQWvgQWYIrSTIHgh2aKAgeyx8WGZSQRQMqQ8WTUI+hP9Bw6kZ57BBKVRCDAOSTapP7wU59lAc
nixNsWTYkwzK8mFzNyitBjXcSB5UfcYRckySg5K8zR1SVWoxROChdTyAoDyO7iCxujzPQyPsi4Uh
B3BXDHycJHWdBuR1RvQ3dhAifJ1AJgGXibDBw4MBSE8VYdTxBWeYcP+B04I1BhEFtHKGX/F3JFOF
CQKrx31g


--===============2745856562753637606==--