Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build

into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build

Makefile.am

@@ -147,6 +147,16 @@ test-force-full:
 test-force-mem:
 	$(MAKE) force=--force mem=--mem test
 
+test-bt:
+	-cd mysql-test ; MTR_BUILD_THREAD=auto \
+	@PERL@ ./mysql-test-run.pl --force --comment=normal --report-features
+	-cd mysql-test ; MTR_BUILD_THREAD=auto \
+	@PERL@ ./mysql-test-run.pl --force --comment=ps --ps-protocol
+
+test-bt-debug:
+	-cd mysql-test ; MTR_BUILD_THREAD=auto \
+	@PERL@ ./mysql-test-run.pl --force --comment=debug --report-features
+
 # Keep these for a while
 test-pl:	test
 test-full-pl:	test-full

support-files/mysql.spec.sh

@@ -354,12 +354,7 @@ then
   cp -fp config.log "$MYSQL_MAXCONFLOG_DEST"
 fi
 
-( cd mysql-test
-  MTR_BUILD_THREAD=auto
-  export MTR_BUILD_THREAD
-  perl ./mysql-test-run.pl --force --report-features
-  perl ./mysql-test-run.pl --force --ps-protocol
-  true )
+make test-bt
 
 # Save mysqld-max
 ./libtool --mode=execute cp sql/mysqld sql/mysqld-max
@@ -418,12 +413,7 @@ then
   cp -fp config.log "$MYSQL_CONFLOG_DEST"
 fi
 
-( cd mysql-test
-  MTR_BUILD_THREAD=auto
-  export MTR_BUILD_THREAD
-  perl ./mysql-test-run.pl --force --report-features
-  perl ./mysql-test-run.pl --force --ps-protocol
-  true )
+make test-bt
 
 %install
 RBR=$RPM_BUILD_ROOT