databases/mysqlwsrep56-server: upgrade 5.6.45-25.27 -> 5.6.46-25.28

PR:		241533
Submitted by:	Teemu Ollakka <teemu.ollakka@galeracluster.com>
Relnotes:	http://releases.galeracluster.com/mysql-wsrep-5.6.46-25.28/release-notes-mysql-wsrep-5.6.46-25.28.txt

1 files changed, 0 insertions, 286 deletions

diff --git a/databases/mysqlwsrep56-server/files/patch-PR225888.diff b/databases/mysqlwsrep56-server/files/patch-PR225888.diff
deleted file mode 100644
index 6e64ed3ebbe5..000000000000
--- a/databases/mysqlwsrep56-server/files/patch-PR225888.diff
+++ /dev/null
@@ -1,286 +0,0 @@
---- extra/yassl/include/openssl/ssl.h.orig	2019-07-16 14:08:43 UTC
-+++ extra/yassl/include/openssl/ssl.h
-@@ -1,5 +1,5 @@
- /*
--   Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
-+   Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
- 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-@@ -179,7 +179,7 @@ enum { /* X509 Constants */
- unsigned long ERR_get_error_line_data(const char**, int*, const char**, int *);
- void          ERR_print_errors_fp(FILE*);
- char*         ERR_error_string(unsigned long,char*);
--void          ERR_remove_state(unsigned long);
-+void          ERR_remove_thread_state(const void *);
- unsigned long ERR_get_error(void);
- unsigned long ERR_peek_error(void);
- int           ERR_GET_REASON(int);
---- extra/yassl/src/ssl.cpp.orig	2019-07-16 14:08:43 UTC
-+++ extra/yassl/src/ssl.cpp
-@@ -1,5 +1,5 @@
- /*
--   Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
-+   Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
- 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-@@ -1516,7 +1516,7 @@ int SSLeay_add_ssl_algorithms()  // compatibility only
- }
- 
- 
--void ERR_remove_state(unsigned long)
-+void ERR_remove_thread_state(const void *)
- {
-     GetErrors().Remove();
- }
---- mysys_ssl/my_aes_openssl.cc.orig	2019-07-16 14:08:43 UTC
-+++ mysys_ssl/my_aes_openssl.cc
-@@ -1,4 +1,4 @@
--/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
-+/* Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
- 
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
-@@ -108,33 +108,46 @@ int my_aes_encrypt(const unsigned char *source, uint32
-                    const unsigned char *key, uint32 key_length,
-                    enum my_aes_opmode mode, const unsigned char *iv)
- {
--  EVP_CIPHER_CTX ctx;
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+  EVP_CIPHER_CTX stack_ctx;
-+  EVP_CIPHER_CTX *ctx= &stack_ctx;
-+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+  EVP_CIPHER_CTX *ctx= EVP_CIPHER_CTX_new();
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   const EVP_CIPHER *cipher= aes_evp_type(mode);
-   int u_len, f_len;
-   /* The real key to be used for encryption */
-   unsigned char rkey[MAX_AES_KEY_LENGTH / 8];
-   my_aes_create_key(key, key_length, rkey, mode);
- 
--  if (!cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
-+  if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
-     return MY_AES_BAD_DATA;
- 
--  if (!EVP_EncryptInit(&ctx, cipher, rkey, iv))
-+  if (!EVP_EncryptInit(ctx, cipher, rkey, iv))
-     goto aes_error;                             /* Error */
--  if (!EVP_CIPHER_CTX_set_padding(&ctx, 1))
-+  if (!EVP_CIPHER_CTX_set_padding(ctx, 1))
-     goto aes_error;                             /* Error */
--  if (!EVP_EncryptUpdate(&ctx, dest, &u_len, source, source_length))
-+  if (!EVP_EncryptUpdate(ctx, dest, &u_len, source, source_length))
-     goto aes_error;                             /* Error */
- 
--  if (!EVP_EncryptFinal(&ctx, dest + u_len, &f_len))
-+  if (!EVP_EncryptFinal(ctx, dest + u_len, &f_len))
-     goto aes_error;                             /* Error */
- 
--  EVP_CIPHER_CTX_cleanup(&ctx);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+  EVP_CIPHER_CTX_cleanup(ctx);
-+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+  EVP_CIPHER_CTX_free(ctx);
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   return u_len + f_len;
- 
- aes_error:
-   /* need to explicitly clean up the error if we want to ignore it */
-   ERR_clear_error();
--  EVP_CIPHER_CTX_cleanup(&ctx);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+    EVP_CIPHER_CTX_cleanup(ctx);
-+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+    EVP_CIPHER_CTX_free(ctx);
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   return MY_AES_BAD_DATA;
- }
- 
-@@ -145,7 +158,12 @@ int my_aes_decrypt(const unsigned char *source, uint32
-                    enum my_aes_opmode mode, const unsigned char *iv)
- {
- 
--  EVP_CIPHER_CTX ctx;
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+  EVP_CIPHER_CTX stack_ctx;
-+  EVP_CIPHER_CTX *ctx= &stack_ctx;
-+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+  EVP_CIPHER_CTX *ctx= EVP_CIPHER_CTX_new();
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   const EVP_CIPHER *cipher= aes_evp_type(mode);
-   int u_len, f_len;
- 
-@@ -153,27 +171,34 @@ int my_aes_decrypt(const unsigned char *source, uint32
-   unsigned char rkey[MAX_AES_KEY_LENGTH / 8];
- 
-   my_aes_create_key(key, key_length, rkey, mode);
--  if (!cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
-+  if (!ctx || !cipher || (EVP_CIPHER_iv_length(cipher) > 0 && !iv))
-     return MY_AES_BAD_DATA;
- 
--  EVP_CIPHER_CTX_init(&ctx);
--
--  if (!EVP_DecryptInit(&ctx, aes_evp_type(mode), rkey, iv))
-+  if (!EVP_DecryptInit(ctx, aes_evp_type(mode), rkey, iv))
-     goto aes_error;                             /* Error */
--  if (!EVP_CIPHER_CTX_set_padding(&ctx, 1))
-+  if (!EVP_CIPHER_CTX_set_padding(ctx, 1))
-     goto aes_error;                             /* Error */
--  if (!EVP_DecryptUpdate(&ctx, dest, &u_len, source, source_length))
-+  if (!EVP_DecryptUpdate(ctx, dest, &u_len, source, source_length))
-     goto aes_error;                             /* Error */
--  if (!EVP_DecryptFinal_ex(&ctx, dest + u_len, &f_len))
-+  if (!EVP_DecryptFinal_ex(ctx, dest + u_len, &f_len))
-     goto aes_error;                             /* Error */
- 
--  EVP_CIPHER_CTX_cleanup(&ctx);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+  EVP_CIPHER_CTX_cleanup(ctx);
-+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+  EVP_CIPHER_CTX_free(ctx);
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+
-   return u_len + f_len;
- 
- aes_error:
-   /* need to explicitly clean up the error if we want to ignore it */
-   ERR_clear_error();
--  EVP_CIPHER_CTX_cleanup(&ctx);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+  EVP_CIPHER_CTX_cleanup(ctx);
-+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+  EVP_CIPHER_CTX_free(ctx);
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   return MY_AES_BAD_DATA;
- }
- 
---- sql-common/client.c.orig	2019-07-16 14:08:43 UTC
-+++ sql-common/client.c
-@@ -1968,7 +1968,11 @@ static int ssl_verify_server_cert(Vio *vio, const char
-     goto error;
-   }
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-   cn= (char *) ASN1_STRING_data(cn_asn1);
-+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+  cn= (char *) ASN1_STRING_get0_data(cn_asn1);
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
- 
-   // There should not be any NULL embedded in the CN
-   if ((size_t)ASN1_STRING_length(cn_asn1) != strlen(cn))
---- sql/mysqld.cc.orig	2019-07-16 14:08:43 UTC
-+++ sql/mysqld.cc
-@@ -4511,7 +4511,11 @@ static int init_ssl()
- {
- #ifdef HAVE_OPENSSL
- #ifndef HAVE_YASSL
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-   CRYPTO_malloc_init();
-+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+  OPENSSL_malloc_init();
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
- #endif
-   ssl_start();
- #ifndef EMBEDDED_LIBRARY
-@@ -4525,7 +4529,9 @@ static int init_ssl()
- 					  opt_ssl_cipher, &error,
-                                           opt_ssl_crl, opt_ssl_crlpath);
-     DBUG_PRINT("info",("ssl_acceptor_fd: 0x%lx", (long) ssl_acceptor_fd));
--    ERR_remove_state(0);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+    ERR_remove_thread_state(0);
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-     if (!ssl_acceptor_fd)
-     {
-       sql_print_warning("Failed to setup SSL");
---- sql/rpl_slave.cc.orig	2019-07-16 14:08:43 UTC
-+++ sql/rpl_slave.cc
-@@ -5258,7 +5258,9 @@ err:
-   mysql_mutex_unlock(&mi->run_lock);
-   DBUG_LEAVE;                                   // Must match DBUG_ENTER()
-   my_thread_end();
--  ERR_remove_state(0);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+  ERR_remove_thread_state(0);
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   pthread_exit(0);
-   return(0);                                    // Avoid compiler warnings
- }
-@@ -5449,7 +5451,9 @@ err:
-   }
- 
-   my_thread_end();
--  ERR_remove_state(0);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+  ERR_remove_thread_state(0);
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   pthread_exit(0);
-   DBUG_RETURN(0); 
- }
-@@ -6663,7 +6667,9 @@ log '%s' at position %s, relay log '%s' position: %s",
- 
-   DBUG_LEAVE;                            // Must match DBUG_ENTER()
-   my_thread_end();
--  ERR_remove_state(0);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+  ERR_remove_thread_state(0);
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   pthread_exit(0);
-   return 0;                             // Avoid compiler warnings
- }
---- vio/viossl.c.orig	2019-07-16 14:08:43 UTC
-+++ vio/viossl.c
-@@ -1,4 +1,4 @@
--/* Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
-+/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
- 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-@@ -415,7 +415,11 @@ static int ssl_do(struct st_VioSSLFd *ptr, Vio *vio,
-       for (j = 0; j < n; j++)
-       {
-         SSL_COMP *c = sk_SSL_COMP_value(ssl_comp_methods, j);
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-         DBUG_PRINT("info", ("  %d: %s\n", c->id, c->name));
-+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-+        DBUG_PRINT("info", ("  %d: %s\n", SSL_COMP_get_id(c), SSL_COMP_get0_name(c)));
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-       }
-   }
- #endif
---- vio/viosslfactories.c.orig	2019-07-16 14:08:43 UTC
-+++ vio/viosslfactories.c
-@@ -1,4 +1,4 @@
--/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
-+/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
- 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-@@ -68,13 +68,21 @@ static DH *get_dh2048(void)
-   DH *dh;
-   if ((dh=DH_new()))
-   {
--    dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
--    dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
--    if (! dh->p || ! dh->g)
--    {
-+    BIGNUM *p= BN_bin2bn(dh2048_p, sizeof(dh2048_p), NULL);
-+    BIGNUM *g= BN_bin2bn(dh2048_g, sizeof(dh2048_g), NULL);
-+    if (!p || !g
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+        || !DH_set0_pqg(dh, p, NULL, g)
-+#endif /* OPENSSL_VERSION_NUMBER >= 0x10100000L */
-+    ) {
-+      /* DH_free() will free 'p' and 'g' at once. */
-       DH_free(dh);
--      dh=0;
-+      return NULL;
-     }
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+    dh->p= p;
-+    dh->g= g;
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-   }
-   return(dh);
- }