From: Tor Didriksen
Date: March 1 2011 2:15pm
Subject: bzr commit into mysql-trunk branch (tor.didriksen:3712)
List-Archive: http://lists.mysql.com/commits/132206
Message-Id: <20110301141519.B5C76376C@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4824595244965524716=="

--===============4824595244965524716==
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/ based on revid:dmitry.lenev@stripped

 3712 Tor Didriksen	2011-03-01
      testing testing

    modified:
      regex/CMakeLists.txt
=== modified file 'regex/CMakeLists.txt'
--- a/regex/CMakeLists.txt	2010-10-05 06:33:15 +0000
+++ b/regex/CMakeLists.txt	2011-03-01 14:15:15 +0000
@@ -21,6 +21,9 @@ ADD_CONVENIENCE_LIBRARY(regex ${REGEX_SO
 ADD_EXECUTABLE(re main.c split.c debug.c)
 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)
-ADD_TEST(regex3 re -er -i${CMAKE_CURRENT_SOURCE_DIR}/tests)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/tests
+               ${CMAKE_CURRENT_BINARY_DIR}/re_tests COPYONLY)
+
+ADD_TEST(regex1 re     -i${CMAKE_CURRENT_BINARY_DIR}/re_tests)
+ADD_TEST(regex2 re -el -i${CMAKE_CURRENT_BINARY_DIR}/re_tests)
+ADD_TEST(regex3 re -er -i${CMAKE_CURRENT_BINARY_DIR}/re_tests)


--===============4824595244965524716==
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\
#   f67wki749yhrdx12
# target_branch: file:///export/home/didrik/repo/trunk/
# testament_sha1: b8f147d9f5cdeaf9633a62ad88ad93621b5e7f74
# timestamp: 2011-03-01 15:15:19 +0100
# source_branch: file:///export/home/didrik/repo/5.5/
# base_revision_id: dmitry.lenev@stripped\
#   4p8g0u7r02yid5b9
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQtDkaQAAYffgCAYVGP/93+v
3iC////6UAPU8zrsuXZo5TBJKnimmQxNKbyap7QUD9U9TR6nigGaaJ4ptR6g0JJ6GmjRkCnpAAAN
AaNHpGgAEkhNpT1GU8pptSPT0pkZNDIBoNMTCBkxzAmJoMJkyZMjCYJppkYmAIYBJQQano1SexCZ
qn6ZUbSaDyjTQGnqAwRoqMPvGNIqpt1QDWAzZaoisByqNEnIu5UiDVjDvcZn6bzi+NsD3XHQxSX/
HpvwwaSmhxwYwum5zRePvVxkZ8a066+5b6lqlOIjo5aSYjO0TWtnj4wszUu0JGcB6nUnUK2VTUbp
0ZMZQbWtEbUDYpiC2SkNKCATK4nbkoo05THCdBuNGMwgevIPmpRTTRs6Lp/4oi6jujoFKWAKMmQF
i0yZBmuQTsbXMgesUmWYgVsgtFRXiJbz+A5AFCCwrC8o0roVEQFgkuvZzWzBdTaBLUAkU8y2m4vZ
LFpNV6/4zisHMNS0SAjqgK5y7WEYqSsTe1eCgsrrpxelMAdjgsQCTVxPBT5ZoOJ4lfLWLgwOFFZS
+gsyxZRQKlexYlWdl/QeZrUVQr9CKBmKnsR5Wja9I4Y76eNMyyNZpy2nGdoLQaYlTMp7gpNgF87V
e7T8sB4JnaRQJvSFCPvN3j3M7ajyNvc3sl6EyVV1o8guRgx5hs59UYIT3Ub0yOCdykjR9lyR5Olj
5cT3BUitD54wE4O0sQ7rZ3v8JIYLMFKJQVCaoo6Yd8UW+FYXBFHIDBudZWXsDj93jgaHTu6HnDx6
yb696RdNzSEDBALdR+Z54T4EXV6/uPNjYzWSqfR3N2rbnHW1gw8K7M4pQyIaB5EQonqxe6rKwVtW
YFBLI0LQFjawNZJOEN7b0HFC0/i3WOicpoZq5ttz8WNwrrCQcSw87ccsKHmu17Y3VlQbMYPgw7mF
JigzqBxTFDTVTFmpyD0p1GHoByc/J2DVywlFwtx3sx6ZAmIHT2b662nNyDHZlFDYBXiaQYUc4qlY
rim8WojsnpXyWXsmAmuIuIINScaKgk47NWd9oRDqyMAe3/F5ynmlfrYeItYXeoxQYIkEm72J9aQw
3pxG6ejekUm8p7tTJYvpJzJ6LCY0AGynYEZLRtSWyMkWSgmW3bcCiGLyPj5gP+kMFF64LO19y9Sw
22ZSNb0tsswKi2i5gGCcmpLn4CkuwM25QRVhOZssEFS0usslJhkzIMY7EFbWKZAzlW2d2DVCgMii
hfzLhg0C5q2YVtCB582HA5UahcNDjkFqI3KIDyUeFUbU2Oz1Xtsk1pUsK0ZLR4WPFhcSiY1bixOC
YWzcLEstRbFMczqj9I/4u5IpwoSAWhyNIA==


--===============4824595244965524716==--