mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 03:52:35 +01:00
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
This commit is contained in:
commit
1484d54821
3 changed files with 18 additions and 5 deletions
13
BUILD/compile-pentium64-debug-max
Executable file
13
BUILD/compile-pentium64-debug-max
Executable file
|
@ -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"
|
|
@ -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
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue