database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge mysql.com:/space/my/mysql-4.1

Browse Source 
into mysql.com:/space/my/mysql-4.1-build


VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Auto merged
This commit is contained in:
unknown
2004-06-24 19:30:34 +02:00
parent 57ee2443ea aafb860588
commit ca4beea968
4 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Build-tools/Do-compile
View File

@ -148,6 +148,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;
$manager_port=$mysql_tcp_port+1;
$mysqladmin_args="--no-defaults -u root --connect_timeout=5 --shutdown_timeout=20";
@ -357,7 +358,7 @@ if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest)
log_timestamp();
system("mkdir $bench_tmpdir") if (! -d $bench_tmpdir);
safe_cd("${test_dir}/mysql-test");
check_system("./mysql-test-run $flags --warnings --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful");
check_system("./mysql-test-run $flags --warnings --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --ndbcluster_port=$ndbcluster_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful");
}
#
@ -475,6 +476,11 @@ $0 takes the following options:
--bdb
Compile with support for Berkeley DB tables
--build-thread=<1,2,3...>
When running several Do-compile runs in parallel, each build
should have its own thread ID, so running the test suites
does not cause conflicts with duplicate TCP port numbers.
--config-env=<environment for configure>
To set up the environment, like 'CC=cc CXX=gcc CXXFLAGS=-O3'

4
VC++Files/innobase/innobase.dsp
View File

@ -368,6 +368,10 @@ SOURCE=.\row\row0vers.c
# End Source File
# Begin Source File
SOURCE=.\srv\srv0que.c
# End Source File
# Begin Source File
SOURCE=.\srv\srv0srv.c
# End Source File
# Begin Source File

4
VC++Files/libmysqld/libmysqld.dsp
View File

@ -568,6 +568,10 @@ SOURCE=..\sql\time.cpp
# End Source File
# Begin Source File
SOURCE=..\sql\tztime.cpp
# End Source File
# Begin Source File
SOURCE=..\sql\uniques.cpp
# End Source File
# Begin Source File

4
VC++Files/sql/mysqld.dsp
View File

@ -1820,6 +1820,10 @@ SOURCE=.\time.cpp
# End Source File
# Begin Source File
SOURCE=.\tztime.cpp
# End Source File
# Begin Source File
SOURCE=.\uniques.cpp
# End Source File
# Begin Source File