Addendum 4 to bug #28179051: Turned the assert into a warning.

Suppressed the warning in MTR.

Author: gkodinov

mysql-test/include/mtr_warnings.sql

@@ -290,6 +290,11 @@ INSERT INTO global_suppressions VALUES
  ("RSA private key file not found"),
  ("RSA public key file not found"),
 
+ /*
+   SSL Library instrumentation failed
+ */
+ ("The SSL library function CRYPTO_set_mem_functions failed"),
+
  ("THE_LAST_SUPPRESSION")||
 
 

share/errmsg-utf8.txt

@@ -18438,6 +18438,10 @@ ER_WARN_DEPRECATED_UTF8MB3_CHARSET_OPTION
 ER_WARN_DEPRECATED_UTF8MB3_COLLATION_OPTION
   eng "%s: '%-.64s' is a collation of the deprecated character set UTF8MB3. Please consider using UTF8MB4 with an appropriate collation instead."
 
+ER_SSL_MEMORY_INSTRUMENTATION_INIT_FAILED
+  eng "The SSL library function %s failed. This is typically caused by the SSL library already being used. As a result the SSL memory allocation will not be instrumented."
+  bg "Функцията от SSL библиотеката %s върна грешка. Това обикновено е защото SSL библиотеката вече е била използвана. Заради това SSL паметта няма да се инструментира."
+
 #
 # End of 8.0 error messages intended to be logged to the server error log.
 #

sql/mysqld.cc

@@ -4490,6 +4490,7 @@ static int warn_self_signed_ca() {
 
 #if !defined(HAVE_WOLFSSL) && defined(HAVE_OPENSSL) && !defined(__sun)
 /* TODO: remove the !defined(__sun) when bug 23285559 is out of the picture */
+
 static PSI_memory_key key_memory_openssl = PSI_NOT_INSTRUMENTED;
 
 #if OPENSSL_VERSION_NUMBER < 0x10100000L
@@ -4517,12 +4518,11 @@ static void init_ssl() {
   mysql_memory_register("mysqld_openssl", all_openssl_memory,
                         array_elements(all_openssl_memory));
 #endif /* defined(HAVE_PSI_MEMORY_INTERFACE) */
-#ifndef DBUG_OFF
-  int ret =
-#endif
-      CRYPTO_set_mem_functions(my_openssl_malloc, my_openssl_realloc,
-                               my_openssl_free);
-  DBUG_ASSERT(ret != 0);
+  int ret = CRYPTO_set_mem_functions(my_openssl_malloc, my_openssl_realloc,
+                                     my_openssl_free);
+  if (ret == 0)
+    LogErr(WARNING_LEVEL, ER_SSL_MEMORY_INSTRUMENTATION_INIT_FAILED,
+           "CRYPTO_set_mem_functions");
 #endif /* HAVE_WOLFSSL */
   ssl_start();
 #endif /* HAVE_OPENSSL */