diff options
| author | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-11-03 13:02:05 +0200 |
|---|---|---|
| committer | unknown <jani@ua141d10.elisa.omakaista.fi> | 2005-11-03 13:02:05 +0200 |
| commit | 1484d54821ff70c2acc43f851ff97fddff0b156c (patch) | |
| tree | ee55ad741a9b72773a37069d55ff9f6f3dac55d8 | |
| parent | 1f37efa0ada46aae3048186116841e45a4d27cb2 (diff) | |
| parent | fb4c949f57b281a232ea581e26b8c48be6c1d873 (diff) | |
| download | mariadb-git-1484d54821ff70c2acc43f851ff97fddff0b156c.tar.gz | |
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
| -rwxr-xr-x | BUILD/compile-pentium64-debug-max | 13 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 6 |
3 files changed, 18 insertions, 5 deletions
diff --git a/BUILD/compile-pentium64-debug-max b/BUILD/compile-pentium64-debug-max new file mode 100755 index 00000000000..f0745c88c90 --- /dev/null +++ b/BUILD/compile-pentium64-debug-max @@ -0,0 +1,13 @@ +#! /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" diff --git a/Makefile.am b/Makefile.am index eada6e08c50..2b0ea0c3dde 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index dcbd74549d3..3f303911d11 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -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" |