Bug #31364927 LDAP TESTS DOES NOT DO CLEAN SHUTDOWN OF SERVER

The server may segfault during the last stages of cleanup during shutdown
after unloading the auth LDAP plugin. This is because the ldap library
will configure SSL to use locking callbacks in the LDAP library.
After unloading libldap, these callbacks point to non-existant code.

For valgrind builds, we add a dependency on the server executable to ldap,
ensuring that ldap will not be unloaded when unloading plugins.
This allows valgrind to see the suppressions we have in valgrind.supp.

For OpenSSL in the 1.0.x series we also add the dependency,
to ensure clean shutdown of the server.

Generalized some valgrind suppressions to match misc OS/compiler combinations.

Change-Id: I6264bda57e0498bf552ed9c805b350724a2dbc5c

Author: Tor Didriksen

mysql-test/valgrind.supp

@@ -1,4 +1,4 @@
-# Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2020, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0,
@@ -60,7 +60,7 @@
    Memcheck:Leak
    fun:memalign
    ...
-   fun:tls_get_addr_tail
+   fun:tls_get_addr_tail*
 }
 
 {
@@ -122,6 +122,16 @@
    fun:pthread_create*
 }
 
+{
+   pthread allocate_dtv memory loss third
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:malloc
+   fun:allocate_dtv_entry
+   ...
+   fun:exit
+}
+
 {
    pthread memalign memory loss
    Memcheck:Leak
@@ -1931,15 +1941,9 @@
 {
    LDAP_TLS_workaround3
    Memcheck:Leak
-   fun:calloc
-   fun:PR_LoadLibraryWithFlags
-   ...
-   ...
-   ...
-   fun:PR_CallOnce
-   ...
+   match-leak-kinds: reachable
    ...
-   fun:_dl_init
+   fun:PR_LoadLibraryWithFlags
 }
 {
    LDAP_TLS_workaround4
@@ -1984,31 +1988,26 @@
 {
    LDAP_TLS_workaround6
    Memcheck:Leak
+   match-leak-kinds: reachable
    fun:malloc
    fun:ber_memalloc_x
    fun:ber_strdup_x
    ...
    fun:ldap_int_initialize
    fun:ldap_create
    fun:ldap_initialize
-   fun:*create*
 }
 {
    LDAP_TLS_workaround7
    Memcheck:Leak
    fun:malloc
    fun:*dl_close_worker*
    fun:*dl_close*
-   fun:*dl_catch_error*
    ...
    fun:*free_mem*
    fun:*libc_freeres*
    fun:*vgnU_freeres*
    fun:*run_exit_handlers*
-   fun:exit*
-   fun:*mysqld_exit*
-   fun:*mysqld_main*
-   fun:*main*
 }
 {
    LDAP_TLS_workaround8
@@ -2019,25 +2018,21 @@
    ...
    fun:ldap_int_initialize
    fun:ldap_set_option
-   fun:*configure_tls*
 }
 {
    LDAP_TLS_workaround9
    Memcheck:Leak
    match-leak-kinds: reachable
    fun:malloc
-   fun:PR_ErrorInstallTable
-   ...
-   ...
-   ...
-   ...
-   ...
-   ...  
-   ...
-   ...
-   ...
-   ...
    ...
+   fun:ldap_int_tls_start
+   fun:ldap_start_tls_s
+}
+{
+   LDAP_TLS_workaround10
+   Memcheck:Leak
+   match-leak-kinds: reachable
+   fun:calloc
    ...
    fun:ldap_int_tls_start
    fun:ldap_start_tls_s
@@ -2076,12 +2071,10 @@
    match-leak-kinds: reachable
    fun:malloc
    fun:PORT_Alloc_Util
-   obj:/usr/lib64/libnss3.so
-   obj:/usr/lib64/libnss3.so
+   ...
    fun:SECMOD_LoadModule
    ...
    fun:ldap_int_tls_start
-   fun:ldap_start_tls_s
    ...
 }
 
@@ -2138,13 +2131,7 @@
    fun:calloc
    fun:PR_LoadLibraryWithFlags
    ...
-   obj:/usr/lib64/libnss3.so
-   ...
    fun:tlsmc_open_nssdb
-   fun:tlsmc_convert
-   fun:tlsmc_intercept_initialization
-   obj:/usr/lib64/libldap-2.4.so.2.10.7
-   ...
 }
 
 {
@@ -2197,16 +2184,10 @@
    Memcheck:Leak
    match-leak-kinds: reachable
    fun:calloc
-   fun:NSSRWLock_New_Util
-   fun:SECOID_Init
    ...
    fun:dl_open_worker
-   fun:_dl_catch_error
-   fun:_dl_open
-   ...
-   fun:PR_LoadLibraryWithFlags
-   obj:/usr/lib64/libnssutil3.so
    ...
+   fun:_dl_open
 }
 
 {
@@ -2231,12 +2212,6 @@
    match-leak-kinds: reachable
    fun:calloc
    fun:PORT_ZAlloc_Util
-   obj:/usr/lib64/libfreeblpriv3.so
-   ...
-   fun:_dlerror_run
-   fun:dlopen@@GLIBC_2.2.5
-   fun:PR_LoadLibraryWithFlags
-   ...
 }
 
 {
@@ -2290,8 +2265,6 @@
    fun:PORT_ArenaAlloc_Util
    ...
    fun:ldap_int_tls_start
-   fun:ldap_start_tls_s
-   ...
 }
 
 {
@@ -2319,11 +2292,8 @@
    fun:PR_NewLock
    ...
    fun:SECMOD_LoadModule
-   obj:/usr/lib64/libnss3.so
    ...
    fun:ldap_int_tls_start
-   fun:ldap_start_tls_s
-   ...
 }
 
 {
@@ -2370,8 +2340,6 @@
    fun:SECMOD_LoadModule
    ...
    fun:ldap_int_tls_start
-   fun:ldap_start_tls_s
-   ...
 }
 
 {
@@ -2429,8 +2397,6 @@
    ...
    fun:tlsmc_convert
    fun:tlsmc_intercept_initialization
-   obj:/usr/lib64/libldap-2.4.so.2.10.7
-   ...
 }
 
 {

sql/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2020, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0,
@@ -1035,6 +1035,21 @@ TARGET_LINK_LIBRARIES(mysqld
   sql_main sql_gis binlog rpl master slave sql_dd mysys
   minchassis binlogevents_static ${ICU_LIBRARIES})
 
+# Add dependency on ldap library, to ensure it is not unloaded
+# when we shutdown the authentication plugin.
+# For Valgrind, we need it to enable our suppressions.
+# For OpenSSL in the 1.0.x series, we need it for clean shutdown.
+IF(WITH_VALGRIND)
+  SET(LINK_MYSQLD_LDAP_LIBRARY 1)
+ENDIF()
+IF(WITH_SSL STREQUAL "system" AND
+    "${OPENSSL_MAJOR_VERSION}.${OPENSSL_MINOR_VERSION}" VERSION_LESS "1.1")
+  SET(LINK_MYSQLD_LDAP_LIBRARY 1)
+ENDIF()
+IF(WITH_AUTHENTICATION_LDAP AND LINK_MYSQLD_LDAP_LIBRARY)
+  TARGET_LINK_LIBRARIES(mysqld ${LDAP_LIBRARY})
+ENDIF()
+
 # Remove transitive link dependencies when linking plugins
 SET_TARGET_PROPERTIES(mysqld PROPERTIES INTERFACE_LINK_LIBRARIES "")