From: Bjorn Munch
Date: November 25 2010 12:47pm
Subject: bzr commit into mysql-5.1-mtr branch (bjorn.munch:2954) Bug#58482
List-Archive: http://lists.mysql.com/commits/125022
X-Bug: 58482
Message-Id: <201011251247.oAPClfV5013135@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1870016146=="

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

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

 2954 Bjorn Munch	2010-11-25
      Bug #58482 mtr doesn't use suite names from individually specified test cases
      It does work in general, the problem here was that the test name
      'alter_table' matches 'main.alter_table-big' which has already been found.
      Fixed by matching more explicitly (with/without suite name)

    modified:
      mysql-test/lib/mtr_cases.pm
=== modified file 'mysql-test/lib/mtr_cases.pm'
--- a/mysql-test/lib/mtr_cases.pm	2010-11-05 14:26:38 +0000
+++ b/mysql-test/lib/mtr_cases.pm	2010-11-25 12:43:58 +0000
@@ -143,7 +143,7 @@ sub collect_test_cases ($$$) {
       {
 	last unless $opt_reorder;
 	# test->{name} is always in suite.name format
-	if ( $test->{name} =~ /.*\.$tname/ )
+	if ( $test->{name} =~ /^$sname.*\.$tname$/ )
 	{
 	  $found= 1;
 	  last;


--===============1870016146==
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/mixsuite-51/
# testament_sha1: 491d1c462c07faa6aa49bddd8b1012c173bcaef7
# timestamp: 2010-11-25 13:47:41 +0100
# base_revision_id: bjorn.munch@stripped\
#   ip1im3zof369xsn4
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWd+8Z5sAAYnfgAAwXPf/91Mi
AAW////7UAPtleqbj1129l7HoSiCap4ieTUz1NGKZPU9EyNMjSMRiNAyQFNgjTRTJ6p6aelGnqHq
AMgepkASgkxATRop+jU1HhT1GjQ9EYEAeoMlJ6TZRoaDIeo000ABoAAAElBFPyNU/VHkj01PIgeo
AA0AAC0UWTr6cPo0x4SmmV8ffGA7RYNg1jcUYcZ+mzN/uOZVU9eafiFOdlXi6t39J5rvCo/OR50S
ktP3pi3KWOVlepbWZSMHqRgnyaGQZpGU6y4e4qQjuj4K4rhqzqQC5rvyZghbAaqeq86jPc8YJ+Gf
aFmxWSEJGZ51C4NSL2g8E9/YMBLe4hFEFSApzRSghwIOPJFSh/RXpE3uId0IbDPucCFasg80BQGR
hs51yW28tHeLr0KDpN47eUaGMoW1um8YMV4qx2oFGyqBYSKBBBud02BRe3PVEu8Qx4cwHzYzx1M5
vWqSufoN8joaKI2LB0WBZBnEOHTQyggWJ7idOmlygFYmMV2nEGX2vFi+ItUSrRkpsC1bqXTD8ggh
sBvca4BiWCLB8RMZmjRR0IFwX8waiT0k0GYWL0v6xi70jVYxGWEq2ZjIYX4SMaConUV2mvTNLIVo
83QlbCCwuoci6K6wJBGS29Z1zxWVMUk18tXXsRCE6qovt2DWkv5l7Ux0QQXfOweUtDVXlzaWlv28
mNbt2JELRxQSqUPCv+M3YZ/LfnRKYdVKEf7gHS1Q3GB3cMkx3GeqzeW7MAvNorP1OUtUm2g7XMJZ
0oke9mtMFSQoAUkC3GIhIvkiBRAyvQYtLGB0uorUal59u21EhGHZs8ajChXPer2MUEwhfs53Pkcd
uEtd0UU+AE5/AcRtJ20y06+NkXZNFdtd6N6KFktiOwoeoZVsTHGyKs0WtSLGwBZguakw4kyEEUuM
8SpbSBcxvb1XYKblMGXiJt4xanMhPYbk9SgmsIOljQ7o9j55UYFQy04WUqvr5FJxu/Wopo07y4Yj
N/MBeNem/azcBU1Bitwt35/TaRQv67kjNHDtbmwDRXrcY4JBJob0ipIa9XqnTpwYN1fUtnKaiFaL
24G0WoTKI2LyjBxsjt5ohcPzqrubGxoIgzOjFU1dTphcoJJCVLFbINYmLLITiXIMwOhN0AoA5x9p
FgXZSX8CwoWy+V6IvmJqIVBUIK7Y3I+pa2gzBVehSqNtFwoKZJTA426hCzhcUcZAF9WqD+wyJSBS
tVUJ5mz20ApOrEFmm2eKenDvXRviJYDkmtzf5b35PzdWkXjQM6Q0mjWWmhmFiyLLVLMQ+pOsLU3g
slSOzOcN5syXsrSXSxEKbhH8srnl/hkS80dXWEgm3wnOWDM1xlmm5oxiNNVdt7wHFiJEaZcYMtB9
jzSVGP0E8Ifv/i7kinChIb94zzY=


--===============1870016146==--