diff options
author | unknown <tomas@poseidon.ndb.mysql.com> | 2005-01-28 02:07:13 +0100 |
---|---|---|
committer | unknown <tomas@poseidon.ndb.mysql.com> | 2005-01-28 02:07:13 +0100 |
commit | a6bfe13c6f4fc2e0c2bebea8a295a445aa5765e8 (patch) | |
tree | 261279056f83d0b99211fefb02c157965ffddd07 /Build-tools | |
parent | cca25e4d4903fbe1df3cd7251d9519c9c9fa376d (diff) | |
parent | 418a06308b6abe8462f5942e0dcf4455fb2073b5 (diff) | |
download | mariadb-git-a6bfe13c6f4fc2e0c2bebea8a295a445aa5765e8.tar.gz |
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
Build-tools/Do-compile:
Auto merged
configure.in:
Auto merged
Diffstat (limited to 'Build-tools')
-rwxr-xr-x | Build-tools/Do-compile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Build-tools/Do-compile b/Build-tools/Do-compile index 68d5b5166ea..03fad4d0f51 100755 --- a/Build-tools/Do-compile +++ b/Build-tools/Do-compile @@ -156,7 +156,7 @@ $ENV{'MYSQL_TCP_PORT'}= $mysql_tcp_port= 3334 + $opt_build_thread*2; $ENV{'MYSQL_UNIX_PORT'}=$mysql_unix_port="$opt_tmp/mysql$opt_suffix.build"; $ENV{"PERL5LIB"}="$pwd/$host/perl5:$pwd/$host/perl5/site_perl"; $slave_port=$mysql_tcp_port+16; -$ndbcluster_port= 9350 + $opt_build_thread*2; +$ndbcluster_port= 9350 + $opt_build_thread*4; $manager_port=$mysql_tcp_port+1; $mysqladmin_args="--no-defaults -u root --connect_timeout=5 --shutdown_timeout=20"; |