diff options
author | Michael Widenius <monty@mariadb.org> | 2014-03-23 21:09:38 +0200 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2014-03-23 21:09:38 +0200 |
commit | 7c81a515161cd952c39535546540a1d5b1314b37 (patch) | |
tree | 0220c30d7e0724912a7907d1572bfc032c32df18 /mysql-test/mysql-test-run.pl | |
parent | 9aac54687286b979c9469326f501a4b23aa5e4a3 (diff) | |
download | mariadb-git-7c81a515161cd952c39535546540a1d5b1314b37.tar.gz |
Make copy_up_file_and_fill() safe for disk full
Fixed use-copy option to mysql-test-run
mysql-test/mysql-test-run.pl:
Fixed use-copy and added comment
sql/log.cc:
Make copy_up_file_and_fill() safe for disk full
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
-rwxr-xr-x | mysql-test/mysql-test-run.pl | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 40aa827e3ce..d3e866673a3 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2686,7 +2686,7 @@ sub setup_vardir() { { $plugindir="$opt_vardir/plugins"; mkpath($plugindir); - if (IS_WINDOWS && !$opt_embedded_server || $opt_use_copy) + if (IS_WINDOWS && !$opt_embedded_server) { for (<$bindir/storage/*$opt_vs_config/*.dll>, <$bindir/plugin/*$opt_vs_config/*.dll>, @@ -2708,7 +2708,14 @@ sub setup_vardir() { <$bindir/sql/*.so>) { my $pname=basename($_); - symlink rel2abs($_), "$plugindir/$pname"; + if ($opt_use_copy) + { + copy rel2abs($_), "$plugindir/$pname"; + } + else + { + symlink rel2abs($_), "$plugindir/$pname"; + } set_plugin_var($pname); } } @@ -6416,6 +6423,9 @@ Options to control what test suites or cases to run skip-test-list=FILE Skip the tests listed in FILE. Each line in the file is an entry and should be formatted as: <TESTNAME> : <COMMENT> + use-copy Copy plugins instead of symlinking them. This is + only useful when running on a system that doesn't + support symlinks. Options that specify ports |