Commit 1351bef4 authored by Michael Widenius's avatar Michael Widenius

Fix for issue found in buildbot where mysqld.*.err files was missing

Added suppression message for valgrind failure found on OpenSuSE 11.1

mysql-test/mysql-test-run.pl:
  Fix for issue found in buildbot where mysqld.*.err files was missing
  Patch by Kristian Nielsen
mysql-test/valgrind.supp:
  Added suppression message for valgrind failure found on OpenSuSE 11.1
sql/mysqld.cc:
  Added missing space to comment
parent e71eb27a
...@@ -2862,7 +2862,6 @@ sub mysql_server_start($) { ...@@ -2862,7 +2862,6 @@ sub mysql_server_start($) {
} }
if (-d $datadir ) { if (-d $datadir ) {
preserve_error_log($mysqld);
mtr_verbose(" - removing '$datadir'"); mtr_verbose(" - removing '$datadir'");
rmtree($datadir); rmtree($datadir);
} }
...@@ -2891,7 +2890,6 @@ sub mysql_server_start($) { ...@@ -2891,7 +2890,6 @@ sub mysql_server_start($) {
unless -d $datadir; unless -d $datadir;
} }
restore_error_log($mysqld);
# Create the servers tmpdir # Create the servers tmpdir
my $tmpdir= $mysqld->value('tmpdir'); my $tmpdir= $mysqld->value('tmpdir');
...@@ -4209,30 +4207,6 @@ sub run_testcase ($$) { ...@@ -4209,30 +4207,6 @@ sub run_testcase ($$) {
} }
# We want to preserve the error log between server restarts, as it may contain
# valuable debugging information even if there is no test failure recorded.
sub _preserve_error_log_names {
my ($mysqld)= @_;
my $error_log_file= $mysqld->if_exist('#log-error');
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);
}
sub preserve_error_log {
my ($mysqld)= @_;
my ($error_log_file, $save_name)= _preserve_error_log_names($mysqld);
rename($error_log_file, $save_name) if $save_name;
# Ignore any errors, as it's just a best-effort to keep the log if possible.
}
sub restore_error_log {
my ($mysqld)= @_;
my ($error_log_file, $save_name)= _preserve_error_log_names($mysqld);
rename($save_name, $error_log_file) if $save_name;
}
# Keep track of last position in mysqld error log where we scanned for # Keep track of last position in mysqld error log where we scanned for
# warnings, so we can attribute any warnings found to the correct test # warnings, so we can attribute any warnings found to the correct test
# suite or server restart. # suite or server restart.
...@@ -4747,7 +4721,6 @@ sub clean_datadir { ...@@ -4747,7 +4721,6 @@ sub clean_datadir {
for (all_servers()) for (all_servers())
{ {
preserve_error_log($_); # or at least, try to
my $dir= "$opt_vardir/".$_->{name}; my $dir= "$opt_vardir/".$_->{name};
mtr_verbose(" - removing '$dir'"); mtr_verbose(" - removing '$dir'");
rmtree($dir); rmtree($dir);
......
...@@ -395,6 +395,15 @@ ...@@ -395,6 +395,15 @@
fun:_Z8udf_freev fun:_Z8udf_freev
} }
{
dlsym memory loss from udf_free on SuSE 11.1 x64 variant 2
Memcheck:Leak
fun:calloc
obj:/lib*/ld-*.so
fun:dlclose
fun:udf_free
}
{ {
dlclose memory loss from plugin variant 1 dlclose memory loss from plugin variant 1
Memcheck:Leak Memcheck:Leak
......
...@@ -7523,7 +7523,7 @@ thread is in the relay logs.", ...@@ -7523,7 +7523,7 @@ thread is in the relay logs.",
"Define threads usage for handling queries: " "Define threads usage for handling queries: "
"one-thread-per-connection" "one-thread-per-connection"
#if HAVE_POOL_OF_THREADS == 1 #if HAVE_POOL_OF_THREADS == 1
", pool-of-threads" ", pool-of-threads "
#endif #endif
"or no-threads.", "or no-threads.",
&opt_thread_handling, &opt_thread_handling, &opt_thread_handling, &opt_thread_handling,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment