From: Bjorn Munch
Date: May 24 2011 8:55am
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3216) Bug#11831031
List-Archive: http://lists.mysql.com/commits/137950
X-Bug: 11831031
Message-Id: <201105240855.p4O8t6Zx026526@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0371360529=="

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

#At file:///home/bm136801/my/mtr-55/ based on revid:bjorn.munch@stripped

 3216 Bjorn Munch	2011-05-24
      Bug#11831031: MTR SHOULD FIND TEST SUITES FROM FEATURE TREES OUTSIDE MYSQL-TEST
      Backported from trunk-mtr

    modified:
      mysql-test/lib/mtr_cases.pm
=== modified file 'mysql-test/lib/mtr_cases.pm'
--- a/mysql-test/lib/mtr_cases.pm	2011-01-18 10:21:37 +0000
+++ b/mysql-test/lib/mtr_cases.pm	2011-05-24 08:54:34 +0000
@@ -287,9 +287,11 @@ sub collect_one_suite($)
 			      "mysql-test/suite",
 			      "mysql-test",
 			      # Look in storage engine specific suite dirs
-			      "storage/*/mysql-test-suites"
+			      "storage/*/mtr",
+			      # Look in plugin specific suite dir
+			      "plugin/$suite/tests",
 			     ],
-			     [$suite]);
+			     [$suite, "mtr"]);
     }
     mtr_verbose("suitedir: $suitedir");
   }


--===============0371360529==
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/mtr-55/
# testament_sha1: 69869f5f94c5d1790164960a83f130d0bb0900cb
# timestamp: 2011-05-24 10:55:06 +0200
# source_branch: file:///home/bm136801/my/main-55/
# base_revision_id: bjorn.munch@stripped\
#   fqk8fxohix1b6bpe
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWW8q18MAAZjfgDAwXHf//3dn
viq////wUAPel72Xtd3nrrXudlwlChT0m9QyjekNNCNMj1AyNqNAGjQAAyJJk9U/E0psm1IGJkAM
gAAAAA0lP1HoJPVNPUyZMACAYEwBBgNE0DEUm1Mmpp6m1D9Keo0MgMQAGgAaAAkkTUwmJtTSeU2I
U9J5QeoAAPUAaDQSBIEgFnXbW/aOy+3OC1sa7dnlrQVYys+GT3zxBRCSs/swqKp6akd8RRi7ahDF
AeXPyacVOazDpnji1Gv98xpsKuUW4x7ZsbR3b2uv81JDAxuLxqKV/LRFV5wSk3ubQhY3RfDkr+N3
WYcLDLHDGqKRSkYpnXOmf6cnQFFnt3TkMEuGCzJwihQGIHMmCvBC6QERxYbT3LlRgwLFUh9DiYUB
ATFlVD/Ae6yIe1GFIKJtfNVOLWIR3Fyd2M0rib9btTFN/9UhTgXdLx4rHtKe8vpThF5QMTSCp1FB
jbRgHQ1toaKymi6XM/ROMROwYWVBuqnIZZDs5MYC7YwTCR5SgIwUC6TDCzQBCCnBBOlxRuCB8t4C
oQJlBrAaXiUQ5grvrAGOzgqwBwNVlCxictdhYUcBWdhbnhsvKJbt1dK1mYvOkfpG9iGZyre4o2uF
VB072WFmo00XqVAdbXbh16Qy6Hv/FdDRGqFImtmmoS5UpkYqVSCAEsFl0Mo1r0+GLoaOTBjJHLLO
ii1Y4M2bo6vZsrO1QmloCSSKgkUUTZDY1amuEJ8zBoG4D+1N5o9yk4T6UwYnoL30MZGDgY/uPszu
RDfczlDl02rUPXXQqSlOkzlrmctvn2k6duKbZm5AzE4rfTkaQzoSdtWi7ZOj8S281HbcbUKp3PO9
gXNI0wJ6CPVtiWHupmK1sJ06RVzmh1bZ3Twz1p8veqohrVmfhLbSGThvQ5OBsY5rFgOJ84+O0xNZ
Y9NCp3dIHVzpoQWH5YYhjKNIri2zSjdrkSgAjKHsjx1eyX4BIJkcYlpu4rFxjDUjYIF4UpKcoil8
eIk4TcZOC0BgXY8L3W295NgKbAsmTy44kPkFfZjqf0BmeFxKKEimllzb6IUUiRUNPBgS+DYJcowf
sgSQBjjQhBdhfspg14iiAiCYi2TxklPcuDHmzsYFzkjIGZXPQnYkMyQ2qqESJAJFB4kOijfcFxti
bhNtrADbAxeUg/SRSRQYgGsOZ465qikXD4DaiJa23p9OfILvm2+EVXdHFlgmUQDTIirfaS9UqSmz
vjsIayV0qFFKUq55oUNpASg7csaRxOLGgLN+hj9r+BVYyCRK3jHBF4Vtc7xmDiHnCSjWTsMJaYxb
Alu1DQNHNAkUzihvkMuOhdovxDDcLkKbAuUQ80yimIE5W5pTzkUv+LuSKcKEg3lWvhg=


--===============0371360529==--