mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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:
unknown 2005-11-03 13:02:05 +02:00
commit 1484d54821
3 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
BUILD/compile-pentium64-debug-max Executable file
View 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"

4
Makefile.am
View file

@ -112,7 +112,7 @@ test:
test-force: test-force:
cd mysql-test; \ cd mysql-test; \
./mysql-test-run --force ; \ ./mysql-test-run --force && \
./mysql-test-run --ps-protocol --force ./mysql-test-run --ps-protocol --force
# We are testing a new Perl version of the test script # We are testing a new Perl version of the test script
@ -123,5 +123,5 @@ test-pl:
test-force-pl: test-force-pl:
cd mysql-test; \ cd mysql-test; \
./mysql-test-run.pl --force ; \ ./mysql-test-run.pl --force && \
./mysql-test-run.pl --ps-protocol --force ./mysql-test-run.pl --ps-protocol --force

6
mysql-test/mysql-test-run.sh
View file

@ -216,10 +216,10 @@ MYSQL_MANAGER_USER=root
# number is to be used, 0 - 16 or similar. # number is to be used, 0 - 16 or similar.
# #
if [ -n "$MTR_BUILD_THREAD" ] ; then 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` MYSQL_MANAGER_PORT=`expr $MASTER_MYPORT + 2`
SLAVE_MYPORT=`expr $MASTER_MYPORT + 16` SLAVE_MYPORT=`expr $MASTER_MYPORT + 3`
NDBCLUSTER_PORT=`expr $MASTER_MYPORT + 24` NDBCLUSTER_PORT=`expr $MASTER_MYPORT + 4`
echo "Using MTR_BUILD_THREAD = $MTR_BUILD_THREAD" echo "Using MTR_BUILD_THREAD = $MTR_BUILD_THREAD"
echo "Using MASTER_MYPORT = $MASTER_MYPORT" echo "Using MASTER_MYPORT = $MASTER_MYPORT"