bk commit into 5.0 tree (kent:1.2025)

[kent]

Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2025 05/10/25 02:49:52 kent@stripped +1 -0
  Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-thread
  into mysql.com:/Users/kent/mysql/bk/mysql-5.0

  Makefile.am
    1.80 05/10/25 02:49:50 kent@stripped +9 -1

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kent
# Host:	c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.0/RESYNC

--- 1.79/Makefile.am	2005-09-28 15:44:24 +02:00
+++ 1.80/Makefile.am	2005-10-25 02:49:50 +02:00
@@ -97,11 +97,13 @@
 	support-files/build-tags
 .PHONY:		init-db bin-dist
 
-# Test installation. Ports are configurable from the environment.
-
-MYSQL_TEST_MANAGER_PORT =	9305
-MYSQL_TEST_MASTER_PORT =	9306
-MYSQL_TEST_SLAVE_PORT =		9308
+# Target 'test' will run the regression test suite using the built server.
+#
+# If you are running in a shared environment, users can avoid clashing
+# port numbers by setting individual small numbers 1-100 to the
+# environment variable MTR_BUILD_THREAD. The script "mysql-test-run"
+# will then calculate the various port numbers it needs from this,
+# making sure each user use different ports.
 MYSQL_TEST_NDB_PORT =		9350
 MYSQL_TEST_RUN_ARGS =		--manager-port=$(MYSQL_TEST_MANAGER_PORT) \
 				--master_port=$(MYSQL_TEST_MASTER_PORT) \
@@ -110,6 +112,12 @@
 
 test:
 	cd mysql-test ; \
+<<<<<<< gca Makefile.am 1.40.1.13
+	./mysql-test-run \
+		--manager-port=$(MYSQL_TEST_MANAGER_PORT) \
+		--master_port=$(MYSQL_TEST_MASTER_PORT) \
+		--slave_port=$(MYSQL_TEST_SLAVE_PORT)
+<<<<<<< local Makefile.am 1.79
 	./mysql-test-run $(MYSQL_TEST_RUN_ARGS) && \
 	./mysql-test-run $(MYSQL_TEST_RUN_ARGS) --ps-protocol
 
@@ -130,3 +138,6 @@
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%
+<<<<<<< remote Makefile.am 1.40.1.14
+	./mysql-test-run
+>>>>>>>