Commit 133ea93b authored by unknown's avatar unknown
Browse files

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-thread 

into mysql.com:/Users/kent/mysql/bk/mysql-4.1
parents 8d6634c9 e17b176e

Makefile.am

+10 −17
Original line number Diff line number Diff line
@@ -97,25 +97,18 @@ tags: 
	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

MYSQL_TEST_NDB_PORT =		9350

# 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.



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) \

		--ndbcluster_port=$(MYSQL_TEST_NDB_PORT) && \

	./mysql-test-run --ps-protocol \

		--manager-port=$(MYSQL_TEST_MANAGER_PORT) \

		--master_port=$(MYSQL_TEST_MASTER_PORT) \

		--slave_port=$(MYSQL_TEST_SLAVE_PORT) \

		--ndbcluster_port=$(MYSQL_TEST_NDB_PORT)

	./mysql-test-run && \

	./mysql-test-run --ps-protocol



test-force:

	cd mysql-test; \

mysql-test/mysql-test-run.sh

+19 −0
Original line number Diff line number Diff line
@@ -209,6 +209,25 @@ NDBCLUSTER_PORT=9350 
MYSQL_MANAGER_PW_FILE=$MYSQL_TEST_DIR/var/tmp/manager.pwd

MYSQL_MANAGER_LOG=$MYSQL_TEST_DIR/var/log/manager.log

MYSQL_MANAGER_USER=root



#

# To make it easier for different devs to work on the same host,

# an environment variable can be used to control all ports. A small

# number is to be used, 0 - 16 or similar.

#

if [ -n "$MTR_BUILD_THREAD" ] ; then

  MASTER_MYPORT=`expr $MTR_BUILD_THREAD '*' 40 + 8120`

  MYSQL_MANAGER_PORT=`expr $MASTER_MYPORT + 2`

  SLAVE_MYPORT=`expr $MASTER_MYPORT + 16`

  NDBCLUSTER_PORT=`expr $MASTER_MYPORT + 24`



  echo "Using MTR_BUILD_THREAD   = $MTR_BUILD_THREAD"

  echo "Using MASTER_MYPORT      = $MASTER_MYPORT"

  echo "Using MYSQL_MANAGER_PORT = $MYSQL_MANAGER_PORT"

  echo "Using SLAVE_MYPORT       = $SLAVE_MYPORT"

  echo "Using NDBCLUSTER_PORT    = $NDBCLUSTER_PORT"

fi



NO_SLAVE=0

USER_TEST=

FAILED_CASES=