diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-11-04 12:04:12 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-11-04 12:04:12 +0200 |
| commit | ff92a3af8bf262447e5ccee3e6929c4088ccbedc (patch) | |
| tree | d61444e72b5619978eaa51dfd4173917935d5777 /mysql-test/lib | |
| parent | 5fe4a51cffcddbf19e706cf4492c2bb8d01944d5 (diff) | |
| download | mariadb-git-ff92a3af8bf262447e5ccee3e6929c4088ccbedc.tar.gz | |
Fixed that test doesn't abort if 'var' points to a deleted directory (common case when using --mem)
Better error message if --log-bin is used without --log-bin-index
mysql-test/lib/v1/mysql-test-run.pl:
Fixed that test doesn't abort if 'var' points to a deleted directory (common case when using --mem)
sql/mysqld.cc:
Better error message if --log-bin is used without --log-bin-index
Diffstat (limited to 'mysql-test/lib')
| -rwxr-xr-x | mysql-test/lib/v1/mysql-test-run.pl | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/mysql-test/lib/v1/mysql-test-run.pl b/mysql-test/lib/v1/mysql-test-run.pl index e9a264ac60b..b903f50568a 100755 --- a/mysql-test/lib/v1/mysql-test-run.pl +++ b/mysql-test/lib/v1/mysql-test-run.pl @@ -2372,8 +2372,11 @@ sub remove_stale_vardir () { mtr_report("WARNING: Using the 'mysql-test/var' symlink"); # Make sure the directory where it points exist - mtr_error("The destination for symlink $opt_vardir does not exist") - if ! -d readlink($opt_vardir); + if (! -d readlink($opt_vardir)) + { + mtr_report("The destination for symlink $opt_vardir does not exist; Removing it and creating a new var directory"); + unlink($opt_vardir); + } foreach my $bin ( glob("$opt_vardir/*") ) { @@ -2432,8 +2435,11 @@ sub setup_vardir() { # it's a symlink # Make sure the directory where it points exist - mtr_error("The destination for symlink $opt_vardir does not exist") - if ! -d readlink($opt_vardir); + if (! -d readlink($opt_vardir)) + { + mtr_report("The destination for symlink $opt_vardir does not exist; Removing it and creating a new var directory"); + unlink($opt_vardir); + } } elsif ( $opt_mem ) { |