From: Bjorn Munch
Date: May 13 2011 11:04am
Subject: bzr commit into mysql-5.1 branch (bjorn.munch:3620)
List-Archive: http://lists.mysql.com/commits/137305
Message-Id: <201105131104.p4DB47AA020179@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///home/bm136801/my/merge-51/ based on revid:tatjana.nuernberg@stripped

 3620 Bjorn Munch	2011-05-13 [merge]
      merge from 5.1-mtr

    modified:
      mysql-test/Makefile.am
=== modified file 'mysql-test/Makefile.am'
--- a/mysql-test/Makefile.am	2011-01-18 10:03:44 +0000
+++ b/mysql-test/Makefile.am	2011-05-03 14:08:25 +0000
@@ -80,7 +80,6 @@ TEST_DIRS = t r include std_data std_dat
 	std_data/funcs_1 \
 	extra/binlog_tests/ extra/rpl_tests \
 	suite/binlog suite/binlog/t suite/binlog/r suite/binlog/std_data \
-	suite/bugs suite/bugs/data suite/bugs/t suite/bugs/r \
 	suite/federated \
 	suite/funcs_1 suite/funcs_1/bitdata \
 	suite/funcs_1/include suite/funcs_1/lib suite/funcs_1/r \

No bundle (reason: revision is a merge).