summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <msvensson@pilot.mysql.com>2008-02-28 10:52:04 +0100
committerunknown <msvensson@pilot.mysql.com>2008-02-28 10:52:04 +0100
commit125e4a450f242a48cf71fc12a9e55d961a78118b (patch)
treebd15db5441839f4bf481bf141939bd4fe9a0bc32 /mysql-test
parent78100d80eae0d3a55ea26cd13ad8cbaa7da425c5 (diff)
downloadmariadb-git-125e4a450f242a48cf71fc12a9e55d961a78118b.tar.gz
Use car/tmp as tempdir for mysqld --bootstrap
Run "mysql --bootstrap" with verbose if turned on
Diffstat (limited to 'mysql-test')
-rwxr-xr-xmysql-test/mysql-test-run.pl3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 6f58f0835bd..1ed675bb06c 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -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" .