Automatic merge with 5.1

3 files changed, 10 insertions, 28 deletions

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index da4c6f44597..d1b1f8d57e6 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2871,7 +2871,6 @@ sub mysql_server_start($) {
     }
 
     if (-d $datadir ) {
-      preserve_error_log($mysqld);
       mtr_verbose(" - removing '$datadir'");
       rmtree($datadir);
     }
@@ -2900,7 +2899,6 @@ sub mysql_server_start($) {
       unless -d $datadir;
 
   }
-  restore_error_log($mysqld);
 
   # Create the servers tmpdir
   my $tmpdir= $mysqld->value('tmpdir');
@@ -4218,30 +4216,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
 # warnings, so we can attribute any warnings found to the correct test
 # suite or server restart.
@@ -4758,7 +4732,6 @@ sub clean_datadir {
 
   for (all_servers())
   {
-    preserve_error_log($_); # or at least, try to
     my $dir= "$opt_vardir/".$_->{name};
     mtr_verbose(" - removing '$dir'");
     rmtree($dir);
diff --git a/mysql-test/valgrind.supp b/mysql-test/valgrind.supp
index cc1ee850e29..e13c0367772 100644
--- a/mysql-test/valgrind.supp
+++ b/mysql-test/valgrind.supp
@@ -396,6 +396,15 @@
 }
 
 {
+   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
    Memcheck:Leak
    fun:calloc
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index e841bae43a4..4e9116874d4 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -7652,7 +7652,7 @@ each time the SQL thread starts.",
    "Define threads usage for handling queries: "
    "one-thread-per-connection"
 #if HAVE_POOL_OF_THREADS == 1
-  ", pool-of-threads"
+  ", pool-of-threads "
 #endif
    "or no-threads.",
    &opt_thread_handling, &opt_thread_handling,