From d132f0e80e7b0a838d1086ad76ac5a305fffd3c1 Mon Sep 17 00:00:00 2001
From: unknown <lenz@mysql.com>
Date: Thu, 24 Jun 2004 11:45:06 +0200
Subject:  - Windows compile fix: added srv/srv0que.c to the innobase project  
  file and sql/tztime.cpp to the libmysqld project file

VC++Files/innobase/innobase.dsp:
   - added missing file srv/srv0que.c to the project file
VC++Files/libmysqld/libmysqld.dsp:
   - added missing file sql/tztime.cpp to the project file
---
 VC++Files/innobase/innobase.dsp   | 4 ++++
 VC++Files/libmysqld/libmysqld.dsp | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/VC++Files/innobase/innobase.dsp b/VC++Files/innobase/innobase.dsp
index a147fb3438c..0768b3095ea 100644
--- a/VC++Files/innobase/innobase.dsp
+++ b/VC++Files/innobase/innobase.dsp
@@ -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
diff --git a/VC++Files/libmysqld/libmysqld.dsp b/VC++Files/libmysqld/libmysqld.dsp
index 8d4dac20b6c..2cdb78fa5d1 100644
--- a/VC++Files/libmysqld/libmysqld.dsp
+++ b/VC++Files/libmysqld/libmysqld.dsp
@@ -564,6 +564,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
-- 
cgit v1.2.1


From 7800c8fec33be11fe5fb11e78b0df5a10d3fc592 Mon Sep 17 00:00:00 2001
From: unknown <lenz@mysql.com>
Date: Thu, 24 Jun 2004 18:17:47 +0200
Subject:  - Windows compile fix: added missing file tztime.cpp to the mysqld  
  project file

VC++Files/sql/mysqld.dsp:
   - added missing file tztime.cpp to the mysqld project file
---
 VC++Files/sql/mysqld.dsp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/VC++Files/sql/mysqld.dsp b/VC++Files/sql/mysqld.dsp
index 3f6b591cbdb..f6e37dc3633 100644
--- a/VC++Files/sql/mysqld.dsp
+++ b/VC++Files/sql/mysqld.dsp
@@ -1816,6 +1816,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
-- 
cgit v1.2.1


From aafb860588f9da611ed8e6abf86eda36a181103a Mon Sep 17 00:00:00 2001
From: unknown <lenz@mysql.com>
Date: Thu, 24 Jun 2004 19:16:44 +0200
Subject:  - start the ndb cluster on different TCP ports when running another 
   build thread

---
 Build-tools/Do-compile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Build-tools/Do-compile b/Build-tools/Do-compile
index 6aa36a9ccdb..cf466ef5848 100755
--- a/Build-tools/Do-compile
+++ b/Build-tools/Do-compile
@@ -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'
 
-- 
cgit v1.2.1