bk commit into 5.1 tree (msvensson:1.2686)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-28 10:52:04+01:00, msvensson@stripped +1 -0
  Use car/tmp as tempdir for mysqld --bootstrap
  Run "mysql --bootstrap" with verbose if turned on

  mysql-test/mysql-test-run.pl@stripped, 2008-02-28 10:52:02+01:00, msvensson@stripped +2 -1
    Use car/tmp as tempdir for mysqld --bootstrap
    Run "mysql --bootstrap" with verbose if turned on

diff -Nrup a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
--- a/mysql-test/mysql-test-run.pl	2008-02-25 16:41:51 +01:00
+++ b/mysql-test/mysql-test-run.pl	2008-02-28 10:52:02 +01:00
@@ -1981,7 +1981,7 @@ sub mysql_install_db {
   mtr_add_arg($args, "--datadir=%s", $data_dir);
   mtr_add_arg($args, "--loose-skip-innodb");
   mtr_add_arg($args, "--loose-skip-ndbcluster");
-  mtr_add_arg($args, "--tmpdir=.");
+  mtr_add_arg($args, "--tmpdir=%s", "$opt_vardir/tmp/");
   mtr_add_arg($args, "--core-file");
 
   if ( $opt_debug )
@@ -2057,6 +2057,7 @@ sub mysql_install_db {
 	output        => $path_bootstrap_log,
 	error         => $path_bootstrap_log,
 	append        => 1,
+	verbose       => $opt_verbose,
        ) != 0)
   {
     mtr_error("Error executing mysqld --bootstrap\n" .