merge with 4.0.15

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-database.c~af098622e818ce0d:
  Auto merged
BitKeeper/deleted/.del-have_openssl_2.inc~8c9f1a45676b698f:
  Auto merged
BitKeeper/deleted/.del-have_openssl_2.require~53bbdfc136fb514:
  Auto merged
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
  Auto merged
BitKeeper/deleted/.del-openssl_2.test~f2dfa927f19d14f8:
  Auto merged
Build-tools/Bootstrap:
  Auto merged
Build-tools/Do-compile:
  Auto merged
SSL/cacert.pem:
  Auto merged
acconfig.h:
  Auto merged
acinclude.m4:
  Auto merged
configure.in:
  Auto merged
SSL/client-cert.pem:
  Auto merged
SSL/client-key.pem:
  Auto merged
SSL/server-cert.pem:
  Auto merged
SSL/server-key.pem:
  Auto merged
VC++Files/client/mysql.dsp:
  Auto merged
VC++Files/client/mysqladmin.dsp:
  Auto merged
VC++Files/client/mysqlclient.dsp:
  Auto merged
VC++Files/client/mysqldump.dsp:
  Auto merged
VC++Files/client/mysqlimport.dsp:
  Auto merged
VC++Files/client/mysqlshow.dsp:
  Auto merged
VC++Files/comp_err/comp_err.dsp:
  Auto merged
VC++Files/innobase/innobase.dsp:
  Auto merged
VC++Files/isamchk/isamchk.dsp:
  Auto merged
VC++Files/libmysql/libmysql.dsp:
  Auto merged
VC++Files/libmysqltest/myTest.dsp:
  Auto merged
VC++Files/my_print_defaults/my_print_defaults.dsp:
  Auto merged
VC++Files/myisamlog/myisamlog.dsp:
  Auto merged
VC++Files/mysql.dsw:
  Auto merged
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
  Auto merged
VC++Files/mysqlcheck/mysqlcheck.dsp:
  Auto merged
VC++Files/mysqlmanager/MySqlManager.dsp:
  Auto merged
VC++Files/mysqlserver/mysqlserver.dsp:
  Auto merged
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
  Auto merged
VC++Files/mysys/mysys.dsp:
  Auto merged
VC++Files/pack_isam/pack_isam.dsp:
  Auto merged
VC++Files/perror/perror.dsp:
  Auto merged
VC++Files/replace/replace.dsp:
  Auto merged
VC++Files/test1/test1.dsp:
  Auto merged
VC++Files/thr_test/thr_test.dsp:
  Auto merged
VC++Files/vio/vio.dsp:
  Auto merged
VC++Files/zlib/zlib.dsp:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
extra/resolveip.c:
  Auto merged
include/m_string.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql_com.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
isam/_search.c:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql/errmsg.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_search.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamlog.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/group_by.result:
  Auto merged
mysql-test/r/isam.result:
  Auto merged
mysql-test/r/loaddata.result:
  Auto merged
mysql-test/r/lowercase_table.result:
  Auto merged
mysql-test/r/multi_update.result:
  Auto merged
mysql-test/r/openssl_1.result:
  Auto merged
mysql-test/r/packet.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/range.result:
  Auto merged
mysql-test/r/select_safe.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
mysql-test/t/lock_tables_lost_commit-master.opt:
  Auto merged
mysql-test/t/lowercase_table.test:
  Auto merged
mysql-test/t/multi_update.test:
  Auto merged
mysql-test/t/openssl_1.test:
  Auto merged
mysql-test/t/range.test:
  Auto merged
mysql-test/t/rpl_loaddata.test:
  Auto merged
mysql-test/t/rpl_log.test:
  Auto merged
mysql-test/t/select_safe.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_getopt.c:
  Auto merged
mysys/my_pthread.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_uniq.h:
  Auto merged
sql/log_event.h:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
vio/Makefile.am:
  Auto merged
vio/vio.c:
  Auto merged
mysql-test/t/myisam.test:
  merge with 4.0.15
  Extra tests
mysys/mf_keycache.c:
  Keep local file

1 files changed, 29 insertions, 9 deletions

diff --git a/Build-tools/Bootstrap b/Build-tools/Bootstrap
index 33eca958ae0..94446d9880f 100755
--- a/Build-tools/Bootstrap
+++ b/Build-tools/Bootstrap
@@ -10,6 +10,7 @@
 # written by Lenz Grimmer <lenz@mysql.com>
 #
 
+use Cwd;
 use Getopt::Long;
 Getopt::Long::Configure ("bundling");
 
@@ -26,18 +27,19 @@ else
 
 # Some predefined settings
 $build_command= "BUILD/compile-pentium-max";
-chomp ($LOGFILE= `pwd`);
-$LOGFILE.= "/Bootstrap.log";
-chomp ($opt_directory= `pwd`);
-$opt_docdir= $opt_directory . "/mysqldoc";
+$PWD= cwd();
+$LOGFILE= $PWD . "/Bootstrap.log";
+$opt_docdir= $PWD . "/mysqldoc";
 $opt_build_command= undef;
 $opt_changelog= undef;
 $opt_delete= undef;
+$opt_directory= $PWD;
 $opt_dry_run= undef;
 $opt_export_only= undef;
 $opt_help= $opt_verbose= 0;
 $opt_log= undef;
 $opt_mail= "";
+$opt_pull= undef;
 $opt_revision= undef;
 $opt_suffix= "";
 $opt_test= undef;
@@ -58,6 +60,7 @@ GetOptions(
 	"help|h",
 	"log|l:s",
 	"mail|m=s",
+	"pull|p",
 	"revision|r=s",
 	"skip-check|s",
 	"skip-manual",
@@ -80,8 +83,7 @@ if (defined $opt_log)
 		}
 		else
 		{
-			chomp ($LOGFILE= `pwd`);
-			$LOGFILE.= "/" . $opt_log;
+			$LOGFILE= $PWD . "/" . $opt_log;
 		}
 	}
 }
@@ -103,7 +105,7 @@ defined($REPO=$ARGV[0]) || print_help("Please enter the BK repository to be used
 system ("bk help > /dev/null") == 0 or &abort("Cannot execute BitKeeper binary!");
 system ("bk root $REPO > /dev/null 2>&1") == 0 or &abort("$REPO does not seem to be a valid BK repository!");
 
-if (($opt_directory ne ".") && (!-d $opt_directory && !$opt_dry_run))
+if (($opt_directory ne $PWD) && (!-d $opt_directory && !$opt_dry_run))
 {
 	&abort("Could not find target directory \"$opt_directory\"!");
 }
@@ -111,6 +113,23 @@ if (($opt_directory ne ".") && (!-d $opt_directory && !$opt_dry_run))
 &logger("Logging to $LOGFILE") if (defined $opt_log);
 
 #
+# Pull recent changes first
+#
+if ($opt_pull)
+{
+	&logger("Updating BK tree $REPO to latest ChangeSet first");
+	$command= "cd $REPO; bk pull; cd ..";
+	&run_command($command, "Could not update $REPO!");
+
+	unless ($opt_skip_manual)
+	{
+		&logger("Updating manual tree in $opt_docdir");
+		$command= "cd $opt_docdir; bk pull; cd ..";
+		&run_command($command, "Could not update $opt_docdir!");
+	}
+}
+
+#
 # Use a temporary name until we know the version number
 #
 $target_dir= $opt_directory . "/mysql-" . $$ . "-" . time() . ".tmp";
@@ -253,7 +272,7 @@ if (defined $opt_changelog)
 #
 # Add the latest manual from the mysqldoc tree
 #
-if (!$opt_skip_manual)
+unless ($opt_skip_manual)
 {
 	$msg= "Adding manual.texi";
 	&logger($msg);
@@ -310,7 +329,7 @@ $command= "make dist";
 if ($opt_win_dist)
 {
 	&logger ("Creating Windows source package");
-	$command= "./scripts/make_win_src_distibution";
+	$command= "./scripts/make_win_src_distribution --tar --zip";
 	&run_command($command, "make_win_src_distribution failed!");
 }
 
@@ -378,6 +397,7 @@ Options:
                            include a log file snippet, if logging is enabled)
                            Note that the \@-Sign needs to be quoted!
                            Example: --mail=user\\\@domain.com
+-p, --pull                 Update the source BK trees before building
 -r, --revision=<rev>       Export the tree as of revision <rev>
                            (default is up to the latest revision)
 -s, --skip-check           Skip checking the distribution with "make distcheck"