Merge trift2.:/MySQL/M51/mysql-5.1

into trift2.:/MySQL/M51/push-5.1

Merge trift2.:/MySQL/M51/mysql-5.1
into trift2.:/MySQL/M51/push-5.1
3f946fac · unknown · 2343b95f · 25da4154 · 3f946fac
Commit 3f946fac authored May 21, 2007 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

Makefile.am Makefile.am +4 -2

No files found.
--- a/Makefile.am
+++ b/Makefile.am
@@ -131,8 +131,10 @@ test-bt:
 	@PERL@ ./mysql-test-run.pl --force --comment=rpl --suite=rpl
 	-cd mysql-test ; MTR_BUILD_THREAD=auto \
 	@PERL@ ./mysql-test-run.pl --force --comment=partitions --suite=parts
-	-cd mysql-test ; MTR_BUILD_THREAD=auto \
-	@PERL@ ./mysql-test-run.pl --force --comment=jp --suite=jp
+
+# Re-enable the "jp" suite when bug#28563 is fixed
+#	-cd mysql-test ; MTR_BUILD_THREAD=auto \
+#	@PERL@ ./mysql-test-run.pl --force --comment=jp --suite=jp

 test-bt-debug:
 	-cd mysql-test ; MTR_BUILD_THREAD=auto \