manually merged

BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-mytest-old.c~5237697b30cf59e4:
  Auto merged
Build-tools/Bootstrap:
  Auto merged
Build-tools/mysql-copyright:
  Auto merged
configure.in:
  Auto merged
BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
  Auto merged
VC++Files/innobase/innobase.dsp:
  Auto merged
client/mysql.cc:
  Auto merged
include/my_global.h:
  Auto merged
innobase/dict/dict0crea.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/include/mtr0log.h:
  Auto merged
innobase/include/mtr0log.ic:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/ut0dbg.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/ut/ut0dbg.c:
  Auto merged
innobase/ut/ut0mem.c:
  Auto merged
libmysql/Makefile.am:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
libmysql/conf_to_src.c:
  Auto merged
libmysql/dll.c:
  Auto merged
libmysql/errmsg.c:
  Auto merged
libmysql/manager.c:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
myisam/mi_key.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/having.result:
  Auto merged
mysql-test/r/heap.result:
  Auto merged
mysql-test/r/type_date.result:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/having.test:
  Auto merged
mysql-test/t/heap.test:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
mysql-test/t/type_uint.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged

2 files changed, 33 insertions, 12 deletions

diff --git a/Build-tools/Bootstrap b/Build-tools/Bootstrap
index fa3c6344a05..c1063363bdf 100755
--- a/Build-tools/Bootstrap
+++ b/Build-tools/Bootstrap
@@ -28,8 +28,8 @@ else
 # Some predefined settings
 $build_command= "BUILD/compile-pentium-max";
 $PWD= cwd();
-$LOGFILE= $PWD . "/Bootstrap.log";
 $opt_docdir= $PWD . "/mysqldoc";
+$opt_archive_log= undef;
 $opt_build_command= undef;
 $opt_changelog= undef;
 $opt_delete= undef;
@@ -51,6 +51,7 @@ $version= "unknown";
 $major=$minor=$release=0;
 
 GetOptions(
+  "archive-log|a",
 	"build-command|b=s",
 	"changelog|c:s",
 	"directory|d=s",
@@ -73,6 +74,17 @@ GetOptions(
 ) || print_help("");
 
 #
+# Override predefined build command
+#
+if (defined $opt_build_command)
+{
+	$build_command= $opt_build_command;
+}
+
+print_help("") if ($opt_help);
+defined($REPO=$ARGV[0]) || print_help("Please enter the BK repository to be used!");
+
+#
 # Override predefined Log file name
 #
 if (defined $opt_log)
@@ -90,16 +102,7 @@ if (defined $opt_log)
 	}
 }
 
-#
-# Override predefined build command
-#
-if (defined $opt_build_command)
-{
-	$build_command= $opt_build_command;
-}
-
-print_help("") if ($opt_help);
-defined($REPO=$ARGV[0]) || print_help("Please enter the BK repository to be used!");
+$LOGFILE= $PWD . "/Bootstrap-" . $REPO . ".log" unless ($LOGFILE);
 
 &logger("Starting build");
 &abort("The directory \"$REPO\" could not be found!") if (!-d $REPO);
@@ -351,6 +354,21 @@ if (!$opt_skip_check)
 # All done when we came down here
 #
 &logger("SUCCESS: Build finished successfully.") if (!$opt_dry_run);
+
+#
+# Move the log file into the Log dir of the target dir
+#
+if ($opt_archive_log)
+{
+  my $logdir= $target_dir . "/Logs";
+  &logger("Moving $LOGFILE to $logdir");
+  mkdir "$logdir" if (! -d $logdir);
+  $command= "mv ";
+  $command.= "-v " if ($opt_verbose || defined $opt_log);
+  $command.= "$LOGFILE $logdir";
+  &run_command($command, "Could not move $LOGFILE to $logdir!");
+}
+
 exit 0;
 
 #
@@ -378,6 +396,8 @@ distribution check can be run before the source archive is being created.
 
 Options:
 
+-a, --archive-log          Move the log file into the Logs directory of
+                           the exported tree after a successful build
 -b, --build-command=<cmd>  Use <cmd> to compile the sources before packing
                            the distribution.
                            (default is "$build_command")
@@ -398,7 +418,7 @@ Options:
                            do not build or test the source distribution
 -h, --help                 Print this help message
 -l, --log[=<filename>]     Write a log file [to <filename>]
-                           (default is "$LOGFILE")
+                           (default is "./Bootstrap-<bk repository>.log")
 -m, --mail=<address>       Mail a failure report to the given address (and
                            include a log file snippet, if logging is enabled)
                            Note that the \@-Sign needs to be quoted!
diff --git a/Build-tools/mysql-copyright b/Build-tools/mysql-copyright
index e1ee513e06d..16f0738dc76 100755
--- a/Build-tools/mysql-copyright
+++ b/Build-tools/mysql-copyright
@@ -101,6 +101,7 @@ sub main
     # on the toplevel of the directory instead. file 'PUBLIC' shouldn't
     # exist in the new mysql distributions, but let's be sure..
     unlink("$destdir/PUBLIC", "$destdir/README");
+    unlink("$destdir/COPYING", "$destdir/EXCEPTIONS-CLIENT");
     copy("$WD/Docs/MySQLEULA.txt", "$destdir");
 
     # remove readline, bdb subdirs and update 'configure'