upmerge 50414

d24618ad · Bjorn Munch · 055a5128 · c72f1efd · d24618ad
Commit d24618ad authored Feb 03, 2010 by Bjorn Munch
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

mysql-test/include/mtr_warnings.sql mysql-test/include/mtr_warnings.sql +6 -0

No files found.
--- a/mysql-test/include/mtr_warnings.sql
+++ b/mysql-test/include/mtr_warnings.sql
@@ -201,6 +201,12 @@ INSERT INTO global_suppressions VALUES
 ("==[0-9]*== For more details"),
 /* This comes with innodb plugin tests */
 ("==[0-9]*== Warning: set address range perms: large range"),
+
+ /* valgrind warnings: invalid file descriptor -1 in syscall
+    write()/read(). Bug #50414 */
+ ("==[0-9]*== Warning: invalid file descriptor -1 in syscall write()"),
+ ("==[0-9]*== Warning: invalid file descriptor -1 in syscall read()"),
+
 /*
   Transient network failures that cause warnings on reconnect.
   BUG#47743 and BUG#47983.