Merge 10.5 into 10.6

1 files changed, 1 insertions, 165 deletions

diff --git a/mysql-test/valgrind.supp b/mysql-test/valgrind.supp
index fc6d2e7ec86..9127bb1f962 100644
--- a/mysql-test/valgrind.supp
+++ b/mysql-test/valgrind.supp
@@ -1,5 +1,5 @@
 # Copyright (c) 2005, 2015, Oracle and/or its affiliates.
-# Copyright (c) 2008, 2019, MariaDB
+# Copyright (c) 2008, 2022, MariaDB
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
@@ -100,137 +100,6 @@
    fun:_dl_start
 }
 
-#
-# Warnings in libz becasue it works with aligned memory(?)
-#
-
-{
-   libz tr_flush_block
-   Memcheck:Cond
-   fun:_tr_flush_block
-   fun:deflate_slow
-   fun:deflate
-   fun:do_flush
-   fun:gzclose
-}
-
-{
-   libz tr_flush_block2
-   Memcheck:Cond
-   fun:_tr_flush_block
-   fun:deflate_slow
-   fun:deflate
-   fun:compress2
-}
-
-{
-   libz longest_match
-   Memcheck:Cond
-   fun:longest_match
-   fun:deflate_slow
-   fun:deflate
-   fun:do_flush
-}
-
-{
-   libz longest_match called from btr_store_big_rec_extern_fields
-   Memcheck:Cond
-   fun:longest_match
-   fun:deflate_slow
-   fun:deflate
-   fun:btr_store_big_rec_extern_fields
-}
-
-{
-   libz longest_match called from page_zip_compress
-   Memcheck:Cond
-   fun:longest_match
-   fun:deflate_slow
-   fun:deflate
-   fun:page_zip_compress
-}
-
-{
-   libz longest_match2
-   Memcheck:Cond
-   fun:longest_match
-   fun:deflate_slow
-   fun:deflate
-   fun:compress2
-}
-
-{
-   libz longest_match 3
-   Memcheck:Cond
-   fun:longest_match
-   fun:deflate_slow
-   fun:deflate
-   fun:gzclose
-}
-
-{
-   libz longest_match 4 
-   Memcheck:Cond
-   fun:longest_match
-   fun:deflate_slow
-   fun:deflate
-   fun:gzflush
-}
-
-{
-   libz longest_match3
-   Memcheck:Cond
-   fun:longest_match
-   fun:deflate_slow
-   fun:deflate
-   fun:azflush
-}
-
-{
-   libz longest_match3
-   Memcheck:Cond
-   fun:longest_match
-   fun:deflate_slow
-   fun:deflate
-   fun:azclose
-}
-
-{
-   libz deflate
-   Memcheck:Cond
-   obj:*/libz.so.*
-   obj:*/libz.so.*
-   fun:deflate
-   fun:compress2
-}
-
-{
-   libz deflate2
-   Memcheck:Cond
-   obj:*/libz.so.*
-   obj:*/libz.so.*
-   fun:deflate
-   obj:*/libz.so.*
-   fun:gzflush
-}
-
-{
-   libz deflate3
-   Memcheck:Cond
-   obj:*/libz.so.*
-   obj:*/libz.so.*
-   fun:deflate
-   fun:do_flush
-}
-
-{
-   libz inflatereset2
-   Memcheck:Cond
-   fun:inflateReset2
-   fun:inflateInit2_
-   fun:uncompress
-}
-
 
 #
 # Warning from my_thread_init becasue mysqld dies before kill thread exists
@@ -706,39 +575,6 @@
 }
 
 {
-   Bug 59874 Valgrind warning in InnoDB compression code
-   Memcheck:Cond
-   fun:*
-   fun:*
-   fun:deflate
-   fun:btr_store_big_rec_extern_fields_func
-   fun:row_ins_index_entry_low
-   fun:row_ins_index_entry
-   fun:row_ins_index_entry_step
-   fun:row_ins
-   fun:row_ins_step
-   fun:row_insert_for_mysql
-}
-
-{
-   In page0zip.c we have already checked that the memory is initialized before calling deflate()
-   Memcheck:Cond
-   fun:*
-   fun:*
-   fun:deflate
-   fun:page_zip_compress
-}
-
-{
-   In page0zip.c we have already checked that the memory is initialized before calling deflate()
-   Memcheck:Cond
-   fun:*
-   fun:*
-   fun:deflate
-   fun:page_zip_compress_deflate
-}
-
-{
    Bug 59875 Valgrind warning in buf0buddy.c
    Memcheck:Addr1
    fun:mach_read_from_4