From: Tor Didriksen
Date: October 5 2010 6:33am
Subject: bzr commit into mysql-trunk-merge branch (tor.didriksen:3227) WL#1054
List-Archive: http://lists.mysql.com/commits/119932
Message-Id: <20101005063320.58EDA3719@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5533212478885355284=="

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

#At file:///export/home/didrik/repo/trunk-merge-br1/ based on revid:vvaintroub@stripped

 3227 Tor Didriksen	2010-10-05
      WL#1054 post-push fix, the 're' test executable now depends on mysys library
     @ regex/CMakeLists.txt
        Add dependency on mysys library

    modified:
      regex/CMakeLists.txt
=== modified file 'regex/CMakeLists.txt'
--- a/regex/CMakeLists.txt	2010-08-12 15:27:53 +0000
+++ b/regex/CMakeLists.txt	2010-10-05 06:33:15 +0000
@@ -19,7 +19,7 @@ SET(REGEX_SOURCES regcomp.c regerror.c r
 ADD_CONVENIENCE_LIBRARY(regex ${REGEX_SOURCES})
 
 ADD_EXECUTABLE(re main.c split.c debug.c)
-TARGET_LINK_LIBRARIES(re regex strings)
+TARGET_LINK_LIBRARIES(re regex strings mysys)
 
 ADD_TEST(regex1 re     -i${CMAKE_CURRENT_SOURCE_DIR}/tests)
 ADD_TEST(regex2 re -el -i${CMAKE_CURRENT_SOURCE_DIR}/tests)


--===============5533212478885355284==
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\
#   pvx5cul7vf3idid3
# target_branch: file:///export/home/didrik/repo/trunk-merge-br1/
# testament_sha1: 430bc2351c080691bc36767e74f61f3289b25d6d
# timestamp: 2010-10-05 08:33:20 +0200
# base_revision_id: vvaintroub@stripped\
#   dx8s3i26k2rqqqb0
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQwJOGUAAZNfgEAQWOf/936v
HIC////wUAPngD2YoAENEBTAaJimmEekNPUBiaGjTG0pkHNMTARpgRhGAAAAJhGBzTEwEaYEYRgA
AACYRgRU/1NJqPKBp6gA0aaaAAAA0NMgkkQxAAmhPRMTShsgaaI0DIbKap8cJ7sJTjnhDWrTCAF0
tSqtKWRLl1sMzH5tJ6mGIiQaF3fPJsW7fOy8QA5mrTCqlaBzyIGbPVNyoTo8CQZDZHYNuHsvrX+i
HeCj9lxVm6M/Zq/MWuux8f9UkuCWKM8LYUw4BQK9vs5ByTWucgYQ3375k8YTMrxVumUk5gnINuIk
7P2jqlQyguUEg+HaeOht74Xp810ZOlk3m4bNf9GkV/j2vVWRsB/x4jyo2156OWcrZmb4qDCOe+ph
861WtaqT74xuseE60Ohmr5UkNz3kWt3qoUVNGq4TjFUlC8XbJG2+qs6J4qcr77qboFrsmJ1jQWqG
rjWqo9FAyKpm92g/CtpxWVien1pz57YlkM3DOrOopp1RtktGFjJTudSxz53TVMN2StuLFwTLYsyX
DsV+mARzlpJ2DlnWnReHVfhUwFPAxxZbSiYpoh26KzegwgtuE0sWwJqpcauiaAZzjUAltMKBkCcR
MNBKCCS0BjTbKosgq0VxnIKzy7LcRLIsz32QymDM+G+ONzF8INJm+/9DRcMHZcJZjcL6IOk6jA06
lD0QBn6vFX95E321kUQUqoeHkvwdVj5YVQurQ4gObb18PVZ+8/ukeN7She3+VKf6Y4nIIPhlP8VF
zJRXzSIeVgtf3p+T7LeEa1Yjmxc1K8/pJdZmooX6TeRTMLJLtHATs766LHvtOh6uQcrg6lcK6Q4l
W9si+40dYkDQKCdb9ty40RTFZUWL6ZgPO9E5cwOnEpPFMnrdduhDY8maAaLnMsJ71kflaLI6wo5c
otnzO0wPx2atiXWDh8U2fMVS7ofxv5bmcDJ0rE40Uqu4aniKvzCAvWZKbFUvJSA2ImMuYWyo9M1p
jRmFofW1Nyunm+C3rdtbVdeHdsxRqFlMVACpcAtC13uEx6bIcmwSZal0E22WFXikSWqhwsKzdCS8
IUHqrlG6KtalM9Jp4voBiajGZVvhQiicHJloW03AoE4b5UHz5pXJMFK8HJrKE/jNZeFmLMDz5YFM
KNLo5JdgqkyuVyp2MlXvYckOXd6W1VxQ2sxI5d4GlaZ+Tl5qid9I5eZ1k6dHvTbCPQC7a2DXcgaK
q5/f7tC1Vq9nhnUjm+hZYdQ6Oe55jM4vpXKDms41F5eM7wqCwGYHuRQ9X9/zRsqTbBdJeVPF/bRH
2L2q1eIt1y4BiqRS31T5MVCxXmnwgDkzYKLHdgvAXZWcYvcTy/xdyRThQkAwJOGU


--===============5533212478885355284==--