Merge with 5.1

2 files changed, 21 insertions, 2 deletions

diff --git a/mysql-test/t/feedback_plugin_send.test b/mysql-test/t/feedback_plugin_send.test
index 14765ee9543..d882539cfea 100644
--- a/mysql-test/t/feedback_plugin_send.test
+++ b/mysql-test/t/feedback_plugin_send.test
@@ -17,7 +17,16 @@ replace_result https http;
 perl;
   $log_error= $ENV{'MYSQLTEST_VARDIR'} . '/log/mysqld.1.err';
   open(LOG, '<', $log_error) or die "open(< $log_error): $!";
-  /feedback plugin:.*/ && print "$&\n" while $_=<LOG>;
+
+  # Get the first few rows (as there may be different number rows in the log)
+  $i= 0;
+  while ($_=<LOG>)
+  {
+    if (/feedback plugin:.*/)
+    {
+      print "$&\n";
+      break if ($i++ >= 3);
+    }
+  }
   close LOG;
 EOF
-
diff --git a/mysql-test/valgrind.supp b/mysql-test/valgrind.supp
index 4f4305a72f7..26e2c1261ab 100644
--- a/mysql-test/valgrind.supp
+++ b/mysql-test/valgrind.supp
@@ -1175,3 +1175,13 @@
    fun:fil_delete_tablespace
    fun:row_drop_table_for_mysql
 }
+
+{
+  Problem with udf and libresolve
+  Memcheck:Cond
+   obj:*/libresolv*.so
+   fun:__libc_res_nquery
+   fun:_nss_dns_gethostbyaddr2_r
+   fun:_nss_dns_gethostbyaddr_r
+   fun:gethostbyaddr_r
+}