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

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


VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Auto merged

4 files changed, 19 insertions, 1 deletions

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'
 
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 5a98b70c4c9..820ca30509c 100644
--- a/VC++Files/libmysqld/libmysqld.dsp
+++ b/VC++Files/libmysqld/libmysqld.dsp
@@ -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

diff --git a/VC++Files/sql/mysqld.dsp b/VC++Files/sql/mysqld.dsp
index 62f7c0597cb..7c599113b6e 100644
--- a/VC++Files/sql/mysqld.dsp
+++ b/VC++Files/sql/mysqld.dsp
@@ -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