From: Bjorn Munch
Date: May 24 2011 8:52am
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3216)
List-Archive: http://lists.mysql.com/commits/137949
Message-Id: <201105240852.p4O8qn9h026485@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1530998287=="

--===============1530998287==
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
      backporting 11831031

    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:52:44 +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");
   }


--===============1530998287==
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: 139453c2e9068f75cef2d89e9e3232e630c23ca1
# timestamp: 2011-05-24 10:52:49 +0200
# source_branch: file:///home/bm136801/my/main-55/
# base_revision_id: bjorn.munch@stripped\
#   fqk8fxohix1b6bpe
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbG4e70AAYrfgDAwXHf//1IG
AAq////wUAOeXve9ra8aHebvbwkkmhU/IaZBgU9GmmkxJk0GhiaPUGhU/UymwmjSNTepNNpAADQA
NNAyFNMjTUzSIP0oaPUAAAAAEkSUepmSYmTeqYGoxGTAIxNNMIJQk0NU8aap6aGobSAAaDI00AJg
mCYCW7JF2kbRt8dRPipw36YoHE9Wdi52NwJcFtOXVpUVTbrSr4fQLLIwPnmNmiGs9f3BrcVnUWTH
Vbujnk9JffxT4HFbZMMff5v4fiCc2epOIzVixVN/7KLpi2y1GaqkTJEUz2X8IaJ37hVWoagwmBxK
QgMOMmJBSBx9DBrQgvBxQB7EOVFtc5QaVdzrHmogVnIO4BysIhUtUFwtnGqfwXoHCZfUNPmyY16E
Dt5PwD6Br5sywnI4LI9CmCMIZyBlpumsoBIjy/BDJIKjC3NW6FA6RxC/Y3InDXojCOSg6gjCKgwm
C8BpFQHZiK8SFbFDThegtQ5HjFEAqkyAwlwXpvGZ9rIioXnHk4wTXcQc262bpZS6qFjWo1bNwSvQ
zYueyuJlQPGyFniHKFwQLRRrQGNeN8GhdQT1GprDC1BXVNrbs+uzLEYXiH6+zIVDQhbmW41uQmIR
sNQ0BjT23bRjR3CuBjb0w6JEMjJj2sgzn5k5LPNEhsszhg1na3phKkSNIwd2WfO/AXfKjBUr0Nxx
wztPer2a1++mANxaM724p0xgjRpx2X/1UH0Ou8vQpXeEkDAvFI0vIWJGvNOdBpmLoGR5xGwwg55b
LWN2OgTlvjs5o5cXSiEjyRdLYjqJzExyh8pGdLKHWwozanDDVfJutllEMbY+rjqeCZaiPY7fMysp
ezRgyiPMT9BqOZXaxozLpjulpcZaFc5ty5xNiLmVmoSqCTJ/FUCnCsut41On19E0dZPEKNPKTIi8
w0Q+92x+0I9gUq65Wii26qPLJI7n3cnXq0G0S5xg/YhFwcdCIKU15b7LIVpEQsXFIZ6zuzzveadT
+w+pIoIe807FN0h3ZjFYnZIkCRiWKHZMrzl8paVLcBSh89O86JFZEyiC9CCpxwKxFmUCGChqIq3d
8tUvMvtRU0NCmpfQrEynAKHoz4aiPh2FAk2NPeFA+sitTyAre10ikEtvAR55dvNMOCJawBV3jJDs
6ASJKgORJeJaZQCV5mQB9weQgWII0VCjw6jDkVTEii7ZkiDg4u5aFwKbQwsFHUa1MH1jUAtqcPFE
pLHK82D7f8XckU4UJCxuHu9A


--===============1530998287==--