diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-09-16 09:58:57 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-09-16 09:58:57 +0200 |
| commit | b170b126b02c2989e68694d6781fb48d4f316363 (patch) | |
| tree | bfc039f3ee09098fe5df5082ba6aaea56ebac313 /mysql-test/mysql-test-run.pl | |
| parent | 41e66d57d5898ea2fa38dfb3a6b47de876efd3c9 (diff) | |
| parent | b4b6494643fa6b0eb96e6af230ab7c47e6ba1be3 (diff) | |
| download | mariadb-git-b170b126b02c2989e68694d6781fb48d4f316363.tar.gz | |
merge with 5.1
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 994f6c077ff..6858ac1a9f7 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -4032,7 +4032,7 @@ sub run_testcase ($$) { sub _preserve_error_log_names { my ($mysqld)= @_; my $error_log_file= $mysqld->if_exist('#log-error'); - return unless $error_log_file and -r $error_log_file; + return (undef, undef) unless $error_log_file; my $error_log_dir= dirname($error_log_file); my $save_name= $error_log_dir ."/../". $mysqld->name() .".error.log"; return ($error_log_file, $save_name); |