1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

merge with 5.1

This commit is contained in:
Sergei Golubchik
2010-09-16 09:58:57 +02:00
34 changed files with 383 additions and 98 deletions

View File

@@ -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);