From: Bjorn Munch
Date: June 1 2011 1:20pm
Subject: bzr commit into mysql-5.5 branch (bjorn.munch:3420)
List-Archive: http://lists.mysql.com/commits/138546
Message-Id: <201106011320.p51DKvOL020117@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0098356758=="

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

#At file:///home/bm136801/my/plpldef-55/ based on revid:jon.hauglid@stripped

 3420 Bjorn Munch	2011-06-01
      Followup to 12607800, testing it in PB2 didn't work, trying again
      Be more explicit about path to (potential) plugin tests dirs

    modified:
      cmake/install_layout.cmake
=== modified file 'cmake/install_layout.cmake'
--- a/cmake/install_layout.cmake	2011-06-01 10:15:01 +0000
+++ b/cmake/install_layout.cmake	2011-06-01 13:19:36 +0000
@@ -103,7 +103,7 @@ ENDIF()
 # just use if(INSTALL_PLUGINTESTDIR).
 # The plugin must set its own install path for tests
 #
-FILE(GLOB plugin_tests plugin/*/tests)
+FILE(GLOB plugin_tests ${CMAKE_SOURCE_DIR}/plugin/*/tests)
 
 #
 # STANDALONE layout


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/plpldef-55/
# testament_sha1: ef157fa391306ffbd6de2c83d7ce20515841321a
# timestamp: 2011-06-01 15:20:57 +0200
# base_revision_id: jon.hauglid@stripped\
#   wqttj5mtqp8lgw23
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWmTeaMAAYbfgEAQVPf/93+u
2gC////6UAOZvZWTj12eq2cJRKabSninqHiR6j0Q0xqaBjU9IB6JtT0RoMoBGjSPFT01PIgAANAA
AaDQNCNBGinqeptGp6QZNNDQ0ADTQaDQCSVPUxGmjaibNU9EPSZDTagANAAACSRGoyPSTMkzQho9
QaNAAAABpVVdMemvtCoVrj0smAHu6+y3baxiunq7YmZibyLU15iSJKLU0QD9DZaBp16XvWr4NtnM
wYqEFOpr8N6fZvXW8oQwW9ZnSLtb34H4IE7D8AiGPMDZNLs3GHgLYXkhwBxocp+rRr2hRuUEikwS
mkkOPG41mEMgmIDFY6At1wJioroEwBhszs15RndSCRcZh6qRkQ3MJ8XHXAiFZkA8ldBwMKDtNWbS
rPAFqAyjLO6JuKIwD46s1wKkE8jOWVkxVU/IMYMc706xgV+EozEU5xfMqoHwTLZMDgrkTCJAluxj
3ggKFDn4BfmgFKyow0hgsbE3CTKXTCEGoPjKhoqiErBQdVSDbNkBAQjoKgdIU0NBz3qBE5CYqiuI
mtz4yLMVAlSMKLnujkprrNrBK8GqEIoshKEcSwdGeMktlPulNrBU2LMCxMooFASMg3JNEEew+eCB
YOC0moDkDUIw42h4DnnLpHJdZtCdiXs1WRxFRNf22DYwYq5ly2b91rddrz1dllltvBPDtZud4pZC
/gkQoSvocLue4FGXxM4j9FNWiXR6og61zjcDZlCokSRbsECDoqxpqvJVV6FUw/eGUiifHdSeYrNr
zPIIXpx/TEaXLhrcVCMhMzJHg9kLBnMz67b9BLeUabA4U2Ev3YVRYekV4r63cFYMBMXJETjJZjHi
m58asggBuOjhn+YlwtwQ1sQ3QkWjFpKTTJc8L7QsBwG5lUV5AK0Sxj+yCoTDUm/TNSxme20WysWo
XAtQmVanoxWomQbIaVNoerhBnl6ezkTluOjrHFScY6SpQDBCPTY2vLRJAMhO8Kp9qFVCnWjMBSKa
tsIbBWHA/MEQi4GUqszzJDFidMrtLLNfljZk4QxXalCdSYpjHHRFEaFnAkLjFdsHgPcSiYdbomYB
4SMrrKkTMmW3WQJ/TvvgpPVNYxqkP1IlCjnvq6ghEmw16VkxS/yhlZkzi43kYziRMV8NTbDE5cDA
kxQohuxWJO23EF6YWMYAy5AWSYruyxPMDWlntaUxAGTa1op1QcpHYiINeuYItiYxzEJsFBcnVscE
qrTPeoPV7IsoqYqKqMPxECwvxRhEjSYH8iMjhRs7gSJmRFeTNTkLnMN32f4u5IpwoSDTJvNG


--===============0098356758==--