From: Tor Didriksen
Date: January 3 2011 1:08pm
Subject: bzr commit into mysql-5.5 branch (tor.didriksen:3215)
List-Archive: http://lists.mysql.com/commits/127784
Message-Id: <20110103130853.501CE3753@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5521522876125095116=="

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

#At file:///export/home/didrik/repo/5.5/ based on revid:guilhem.bichot@stripped

 3215 Tor Didriksen	2011-01-03
      Add mysys to mysqld dependencies, trying to un-break the build on debian

    modified:
      sql/CMakeLists.txt
=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt	2010-11-20 14:47:50 +0000
+++ b/sql/CMakeLists.txt	2011-01-03 13:08:48 +0000
@@ -132,7 +132,7 @@ IF(NOT WITHOUT_DYNAMIC_PLUGINS)
 ENDIF()
 
 SET_TARGET_PROPERTIES(mysqld PROPERTIES ENABLE_EXPORTS TRUE) 
-TARGET_LINK_LIBRARIES(mysqld sql)
+TARGET_LINK_LIBRARIES(mysqld sql mysys)
 
 # Provide plugins with minimal set of libraries
 SET(INTERFACE_LIBS ${LIBRT})


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   vvrm8248fhqtab8g
# target_branch: file:///export/home/didrik/repo/5.5/
# testament_sha1: b5f56880d72deae56c5fa3e4ff25972161c5188b
# timestamp: 2011-01-03 14:08:53 +0100
# base_revision_id: guilhem.bichot@stripped\
#   marh583un7wuszsh
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRt+jAcAAXFfgEAQUGf/936v
HAC////wUAOa2PWXGtevcnkJREMiYJqNiap+lPZTKHqPRPUe1EejT0oBJQmpptGmTKNU/VNGTGph
pNGBBggCSJGEmJkanlPUNI9QB6jRoMg0GgZKho0wjQ0wmhoA0yNGTQAMgklMp5U/QJlGEzUyNG1G
gAAGgNiu0m3f49ppzTNJ0hsAyd+aWcJ14dmjMx9vov1VFihdBWxdcmZM/epta9KGPYjFIve3Y+uT
TVQ6rejFQ2c5bFjPYQrt/RzDX2rynnOwTGTywWiRolJZVxw1WC4IN4jiYFQmEwOzsJzTabyVR1Cj
EGUC6UPvudbFYy4QFEPYwn1M84KoUXV6hY5GVdYTbXDdMX5uU9q7KN4Wx9Mjl03wLJ79HG5Aq6Ms
TAySubcV3ye/Nw1pDaMDxPUjEKcfnGC2swETBCwyyL6iWEx70FgeXrHV5c78kz4F4WCcVVrbVsoZ
TuKYZQg5E/fRLB1hyqUR2msnnj7mDAYSrAr71jJQeW5HyPa8qPv6IysH0M4qUlab6blqzuggqS5h
ZFxulBOFgPninyjPbDo25YiYWwn5ri+VImU7TQ/0raTYg1t9eGOCeDuRYixLAOCJyu4l3C2RajWt
vK5wQomed8cqiqvr00Twwer+qrn2IursOpLMs+dNUlShlxgLGBfjAJz5Ig/cRtBva8ymjib9pEIk
5KjqK5uLxJofEZGlFJq546w4SHzPpo7W02gybWJF5JIj9br2m/HJ8L1YmdY5Muu6zlkVpczTSiXE
qApyw7kEX7khobNPd6fj4bbNGKs853hL4YTPmw69caNO2kP6Rtvqang5MsXlAs58TEuTKoy3ylqc
TMuIwcjaSyzThrNxkbS8eOKCnYJnv8H7WG84bh5CpZISEXLRawOlMQDyBRMpbChVB0C+VYUFlZ5E
LWSU/zFEbNG0c8DhOipCW94UfrtfXBWFRt1BlabomY/0r0s0GOYuDoIge5pCgKJgc9mnSGLhk8nt
zbmwRWuoT0OtQU87DHhPjGJLh0sUtnewyZ0mqjOqIM9cC2o4xdFTJlb5C+vIwBWyD21nbNLxSGCx
c8yuVlVSpxMycchZDPPjhG01UBCkUsjJUJklcORK7COUNGsDUKSqhsxRrlEH3jpla1rOxgWGhp7l
rBtqnrPLzZWER5eEExxoqf5bGuonWHAKrZxNzPpC7jiPKFBjt+AYhqara2Kmw7lXaO4fmuTDnUel
bNXsVp1AahWCzHauM1nC9RVORmGGrLw3X1TGUjBf4u5IpwoSA2/RgOA=


--===============5521522876125095116==--