From 72e0cbeef29b1b54c653d1d885a5cac155bca837 Mon Sep 17 00:00:00 2001
From: Tor Didriksen <tor.didriksen@oracle.com>
Date: Mon, 29 Aug 2011 10:07:18 +0200
Subject: [PATCH] Bug#12856915 adapt valgrind suppressions to 5.5
---
mysql-test/valgrind.supp | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/mysql-test/valgrind.supp b/mysql-test/valgrind.supp
index a0345684cb4..f6bf8a690e4 100644
--- a/mysql-test/valgrind.supp
+++ b/mysql-test/valgrind.supp
@@ -883,23 +883,24 @@
write(buf)
obj:*/libpthread*.so
fun:my_write
+ fun:inline_mysql_file_write
fun:my_b_flush_io_cache
fun:_my_b_write
fun:_ZL10write_keysP13st_sort_paramPPhjP11st_io_cacheS4_
fun:_ZL13find_all_keysP13st_sort_paramP10SQL_SELECTPPhP11st_io_cacheS6_S6_
- fun:_Z8filesortP3THDP8st_tableP13st_sort_fieldjP10SQL_SELECTybPy
+ fun:_Z8filesortP3THDP5TABLEP13st_sort_fieldjP10SQL_SELECTybPy
}
-{
- Bug#12856915 VALGRIND FAILURE IN FILESORT/CREATE_SORT_INDEX / two
- Memcheck:Param
- write(buf)
- obj:*/libpthread*.so
- fun:my_write
- fun:my_b_flush_io_cache
- fun:_Z15merge_many_buffP13st_sort_paramPhP10st_buffpekPjP11st_io_cache
- fun:_Z8filesortP3THDP8st_tableP13st_sort_fieldjP10SQL_SELECTybPy
-}
+## {
+## Bug#12856915 VALGRIND FAILURE IN FILESORT/CREATE_SORT_INDEX / two
+## Memcheck:Param
+## write(buf)
+## obj:*/libpthread*.so
+## fun:my_write
+## fun:my_b_flush_io_cache
+## fun:_Z15merge_many_buffP13st_sort_paramPhP10st_buffpekPjP11st_io_cache
+## fun:_Z8filesortP3THDP8st_tableP13st_sort_fieldjP10SQL_SELECTybPy
+## }
{
Bug#12856915 VALGRIND FAILURE IN FILESORT/CREATE_SORT_INDEX / three
@@ -907,6 +908,7 @@
write(buf)
obj:*/libpthread*.so
fun:my_write
+ fun:inline_mysql_file_write
fun:my_b_flush_io_cache
- fun:_Z8filesortP3THDP8st_tableP13st_sort_fieldjP10SQL_SELECTybPy
+ fun:_Z8filesortP3THDP5TABLEP13st_sort_fieldjP10SQL_SELECTybPy
}
--
2.30.9