diff options
author | Tor Didriksen <tor.didriksen@oracle.com> | 2011-08-30 10:51:23 +0200 |
---|---|---|
committer | Tor Didriksen <tor.didriksen@oracle.com> | 2011-08-30 10:51:23 +0200 |
commit | 6cf3d1a5dbd7f522120e87fcbd25f2fd28ef5065 (patch) | |
tree | b476774053d45674f2817ff7cdbc54a946ecedfa /mysql-test/valgrind.supp | |
parent | 74e7990a967e09012d0463b97a01a3050a92c2b3 (diff) | |
parent | 93d2fcbc9c96ac12dca3c7e037f48a4ab01892d3 (diff) | |
download | mariadb-git-6cf3d1a5dbd7f522120e87fcbd25f2fd28ef5065.tar.gz |
merge 5.1 => 5.5
Diffstat (limited to 'mysql-test/valgrind.supp')
-rw-r--r-- | mysql-test/valgrind.supp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mysql-test/valgrind.supp b/mysql-test/valgrind.supp index f6bf8a690e4..d85ce5e3f86 100644 --- a/mysql-test/valgrind.supp +++ b/mysql-test/valgrind.supp @@ -877,6 +877,9 @@ fun:buf_buddy_free } +# Note the wildcard in the (mangled) function signatures of +# write_keys() and find_all_keys(). +# They both return ha_rows, which is platform dependent. { Bug#12856915 VALGRIND FAILURE IN FILESORT/CREATE_SORT_INDEX / one Memcheck:Param @@ -886,8 +889,8 @@ 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:_Z*10write_keysP13st_sort_paramPPhjP11st_io_cacheS4_ + fun:_Z*13find_all_keysP13st_sort_paramP10SQL_SELECTPPhP11st_io_cacheS6_S6_ fun:_Z8filesortP3THDP5TABLEP13st_sort_fieldjP10SQL_SELECTybPy } |