Commit 1484d548 authored by unknown's avatar unknown
Browse files

Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0 

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1


Makefile.am:
  Merged from 4.0
mysql-test/mysql-test-run.sh:
  Merged from 4.0
parents 1f37efa0 fb4c949f

BUILD/compile-pentium64-debug-max

0 → 100755
+13 −0
Original line number Diff line number Diff line 
#! /bin/sh



path=`dirname $0`

. "$path/SETUP.sh" $@ --with-debug=full



extra_flags="$pentium64_cflags $debug_cflags $max_cflags"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$pentium_configs $debug_configs $max_configs"



extra_configs="$extra_configs "



. "$path/FINISH.sh"

Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ test: 


test-force:

	cd mysql-test; \

	./mysql-test-run --force ; \

	./mysql-test-run --force && \

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



# We are testing a new Perl version of the test script
@@ -123,5 +123,5 @@ test-pl: 


test-force-pl:

	cd mysql-test; \

	./mysql-test-run.pl --force ; \

	./mysql-test-run.pl --force && \

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

mysql-test/mysql-test-run.sh

+3 −3
Original line number Diff line number Diff line
@@ -216,10 +216,10 @@ MYSQL_MANAGER_USER=root 
# number is to be used, 0 - 16 or similar.

#

if [ -n "$MTR_BUILD_THREAD" ] ; then

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

  MASTER_MYPORT=`expr $MTR_BUILD_THREAD '*' 5 + 10000`

  MYSQL_MANAGER_PORT=`expr $MASTER_MYPORT + 2`

  SLAVE_MYPORT=`expr $MASTER_MYPORT + 16`

  NDBCLUSTER_PORT=`expr $MASTER_MYPORT + 24`

  SLAVE_MYPORT=`expr $MASTER_MYPORT + 3`

  NDBCLUSTER_PORT=`expr $MASTER_MYPORT + 4`



  echo "Using MTR_BUILD_THREAD   = $MTR_BUILD_THREAD"

  echo "Using MASTER_MYPORT      = $MASTER_MYPORT"