Manual merge.

Makefile.am:
  Manual merge: For "test", use Kent's new version using the Perl script with port variables,
  but also have the "test-force" target (used in the RPM spec!) (still using Shell).

Makefile.am

@@ -116,3 +116,8 @@ test:
 		--master_port=$(MYSQL_TEST_MASTER_PORT) \
 		--slave_port=$(MYSQL_TEST_SLAVE_PORT) \
 		--ndbcluster_port=$(MYSQL_TEST_NDB_PORT)
+
+test-force:
+	cd mysql-test; \
+	./mysql-test-run --force ;\
+	./mysql-test-run --ps-protocol --force