Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0

into  frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-4.0

Makefile.am

@@ -85,8 +85,15 @@ tags:
 	support-files/build-tags
 .PHONY:		init-db bin-dist
 
-# Test installation
+# Test installation. Ports are configurable from the environment.
 
-test:
-	cd mysql-test ; ./mysql-test-run
+MYSQL_TEST_MANAGER_PORT =	9305
+MYSQL_TEST_MASTER_PORT =	9306
+MYSQL_TEST_SLAVE_PORT =		9308
 
+test:
+	cd mysql-test ; \
+	./mysql-test-run \
+		--manager-port=$(MYSQL_TEST_MANAGER_PORT) \
+		--master_port=$(MYSQL_TEST_MASTER_PORT) \
+		--slave_port=$(MYSQL_TEST_SLAVE_PORT)